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

Conflicts:
	source/blender/editors/gpencil/drawgpencil.c

2017-01-05 00:31:15 +01:00

..

blender

Merge branch 'master' into blender2.8

2017-01-05 00:31:15 +01:00

blenderplayer

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

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

creator

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

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

gameengine

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

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

tools @ 896c5f7895

Point submodules to latest master branches

2016-09-02 11:44:22 +02:00

CMakeLists.txt

Move tests into tests/ top-level dir

2014-06-18 22:03:46 +10:00