Bastien Montagne 8ccb27fc0a Merge branch 'master' into blender2.8 ...

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

2018-10-24 09:00:13 +02:00

..

blender

Merge branch 'master' into blender2.8

2018-10-24 09:00:13 +02:00

creator

Merge remote-tracking branch 'origin/master' into blender2.8

2018-10-22 10:19:06 -06:00

tools @ 11656ebaf7

Revert "Fix: insert missing break in switch statement"

2018-09-24 15:40:01 +02:00

CMakeLists.txt

Merge branch 'master' into blender2.8

2018-06-29 09:25:40 +02:00