Blender Git Loki

Merge branch 'master' into soc-2013-rigid_body_sim

Conflicts:
intern/rigidbody/CMakeLists.txt
release/datafiles/splash.png
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_view3d_types.h

svn merge -r60422:60726 ^/trunk/blender

rigidbody: Code cleanup

Remove duplicate code.

rigidbody: Try to use old collision shape if creating new one fails

Switching to box in that case isn't very nice behaviour and should be
avoided if possible.

rigidbody: Add impulse threshold for collision based activation

rigidbody: Only handle activation when collision was detected

Somehow missed to add this before.

svn merge -r60273:60421 ^/trunk/blender

rigidbody: Don't handle collision after hitting a trigger

rigidbody: Code cleanup

Make functions private that are only used internally.
Also remove a nested if statement.

rigidbody: Code cleanup

Avoid mixing bool and int.

rigidbody: Flag bodies for validation when changing shape

This fixes a pretty old crash that occurs when changing the collision
shape to a mesh shape during simulation.

Thanks to Thomas Beck (plasmasolutions) for the report.

rigidbody: Fix crash switching to a mesh shape during simulation while using deformation

Thanks to Thomas Beck (plasmasolutions) for the report.

rigidbody: Update 3D view when changing the shape via operator

rigidbody: Only allow static-static collision when trigger is kinematic

This way passive object don't activate passive objects when using
activation on collision.

rigidbody: Don't try to deform shapes if we don't have a derived mesh

rigidbody: Abort mesh shape creation when we can't get a derived mesh

Would only assert before, now just return.

Thanks to Thomas Beck (plasmasolutions) for report.

rigidbody: Allow deformation option to be animated

rigidbody: Fix crash with meshes that have both quads and tirs/ngons

Triangles weren't counted right, silly copy paste mistake.

rigidbody: Fix activation not working with passive objects as triggers

Need to allow static-static collisions in this case, since deactivated
bodies are static.

rigidbody: Fix conflict between collision and time based activation

Now do more thorough check.