Bastien Montagne 24d29f2e50 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenkernel/intern/particle.c
	source/blender/editors/transform/transform_snap_object.c

2016-06-07 09:59:26 +02:00

..

CMakeLists.txt

Removed point cache operators.

2016-04-29 10:44:09 +02:00

dynamicpaint_ops.c

Dynamicpaint: fix (unreported) missing progress bar in early baking stage.

2016-05-21 16:09:35 +02:00

physics_fluid.c

Cleanup: unused headers

2014-11-28 22:16:14 +01:00

physics_intern.h

Removed point cache operators.

2016-04-29 10:44:09 +02:00

physics_ops.c

Removed point cache operators.

2016-04-29 10:44:09 +02:00

rigidbody_constraint.c

Fix T48582: Rigidbody simulation issue with new depsgraph

2016-06-06 14:38:12 +02:00

rigidbody_object.c

Fix T48582: Rigidbody simulation issue with new depsgraph

2016-06-06 14:38:12 +02:00

rigidbody_world.c

Cleanup: line width

2016-02-07 22:56:20 +11:00