Julian Eisel a99495d291 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/blenkernel/intern/scene.c

2017-03-02 19:15:32 +01:00

..

CMakeLists.txt

Revert particle system and point cache removal in blender2.8 branch.

2016-12-28 17:30:58 +01:00

dynamicpaint_ops.c

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

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

particle_boids.c

Revert particle system and point cache removal in blender2.8 branch.

2016-12-28 17:30:58 +01:00

particle_edit.c

Remove all instance of OBACT from particle_edit.c and related changes

2017-03-02 17:14:59 +01:00

particle_object.c

Remove all instance of OBACT from particle_edit.c and related changes

2017-03-02 17:14:59 +01:00

physics_fluid.c

Render Layers and Collections (merge from render-layers)

2017-02-07 11:11:00 +01:00

physics_intern.h

Revert particle system and point cache removal in blender2.8 branch.

2016-12-28 17:30:58 +01:00

physics_ops.c

Fix another part of T50565: Planar constraints were always initialized to accurate transform

2017-03-02 12:18:07 +01:00

physics_pointcache.c

Sorted BaseLegacy > Base convertions

2017-02-14 18:21:47 +01:00

rigidbody_constraint.c

Remove OBACT from rigidbody_constraint.c and remove uneeded sanity check

2017-03-02 17:09:24 +01:00

rigidbody_object.c

Render Layers and Collections (merge from render-layers)

2017-02-07 11:11:00 +01:00

rigidbody_world.c

Cleanup: line width

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