Sergey Sharybin d812e0cb64 Blender 2.8: Apparently auto-merge worked incorrect in the merge commit

2017-01-26 17:04:25 +01:00

..

blender

Blender 2.8: Apparently auto-merge worked incorrect in the merge commit

2017-01-26 17:04:25 +01:00

blenderplayer

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

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

creator

Merge branch 'master' into blender2.8

2017-01-24 14:56:56 +01:00

gameengine

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

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

tools @ 6bbb68073b

Revert "UI: Add missing menu item"

2017-01-25 01:33:10 -05:00

CMakeLists.txt

…