Blender Git Loki

Patch 28492 from Andrew Wiggin (ender79) to fix loop deselect problem (bug 28492)

This disables, at least for now, some code that was marked as 'not 100% reliable' that was breaking trunk behavior.

use SetEnvironmentVariableA to set env var on windows

[#27884] Collada import: materials mismatch when 2 instance_geometry reference the same material
Reported by David Roy

Multi-materials used on different meshes would get ignored (resulting in white faces in textured view).

Camera tracking integration
===========================

Fix compilation for 32bit OSX.

Fix #28500: Reshape in multires modifier makes blender crash

Multires doesn't store displacement for base mesh and reshaping when
multires subdivision level is set to zero is crappy.

Add report that reshape can't work with base level and cancel reshape operator.

Fix #28423: Screw-modifier crash in cunjunction with subsurf modifier

Problems was caused by angle=2*pi and steps=2 in screw modifier.
Such configuration produced duplicated geometry to close object
and it was confusing for subsurf cache.

Restrict steps=2 for screw modifier now, so now 3<=steps<=512.

Prevent potential crasher, commonEffects could be empty.

BGE animations: fixing initialization order issues for BL_ActionActuator and BL_ArmatureObject. Thanks to z0r for pointing them out and providing a fix.

BGE animations: Fixing a potential crash when using camera IPOs. The IPOs were being created off of blendercamera->adt->action when they should have been using the supplied action. Thanks to z0r for pointing out the problem and a potential fix.

Fix [#28322] COLLADA imports messed up UVs
Reported by Chad Gleason

Imported index order could put mface->v4==0. We already know amount of verts, so use that instead.

Some whitespace changes

Merged changes in the trunk up to revision 39896.

BGE animations: Adding a separate list to KX_Scene for animated objects. This makes scenes with a lot of non-animated objects faster. In my test scene with 8000 static, non-animated cubes my time spent on animations went from 1.5~1.7ms to 0.001ms.

Merged changes in the trunk up to revision 39826.

Made a major amount of conflict resolution for code adaptation to
the animation system updates introduced in the Pepper branch recently
merged to the trunk.

Resolved conflicts:
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/library.c
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/animation/keyframes_draw.c
source/blender/editors/animation/keyframes_edit.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/space_nla/nla_buttons.c
source/blender/editors/space_nla/nla_channels.c
source/blender/makesdna/DNA_action_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/rna_main_api.c

BGE animations: Fixing a crash that would happen if the property for a property mode action actuator was invalid.

warning fixes

Fixes for smooth shading of primitves.

Reverses order of vertices that weld op gives to make ngon so that it doesn't
reverse the normal from what it used to be.
Fixed a bunch of inconsistent normals in primitives: circle (made normal(s)
point up instead of down), uvsphere, icosphere, cylinder, and cone.
Reviewed at http://codereview.appspot.com/4959056/.
Cone and Cylinder still don't shade properly with ngon end caps, but that is now a different issue from normals.

svn merge -r39878:39890 https://svn.blender.org/svnroot/bf-blender/trunk/blender

svn merge -r39877:39878 https://svn.blender.org/svnroot/bf-blender/trunk/blender, merged manually

Cycles:
* Compute MD5 hash to deal with nvidia opencl compiler cache not recognizing
changes in #included files, makes it possible to do kernel compile only
once and remember it for the next time blender is started.
* Kernel tweak to compile with ATI/linux. Enabling any more functionality than
simple clay render still chokes the compiler though, without a specific error
message ..