Bastien Montagne 0e70feab22 Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/windowmanager/intern/wm_init_exit.c

2018-10-22 10:55:16 +02:00

..

blender

Merge branch 'master' into blender2.8

2018-10-22 10:55:16 +02:00

creator

Make Static Override optional/hidden by default.

2018-10-19 18:38:19 +02: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