Bastien Montagne 43eebdfebd Merge branch 'master' into blender2.8 ...

Conflicts:
	source/blender/collada/DocumentImporter.cpp
	source/blender/editors/include/ED_object.h
	source/blender/editors/object/object_modifier.c

2018-06-12 12:58:31 +02:00

..

blender

Merge branch 'master' into blender2.8

2018-06-12 12:58:31 +02:00

creator

--debug-gpu-shader: Dump GLSL shaders to disk

2018-06-02 20:29:27 +02:00

tools @ 9d7d338cb2

UI: initial support for parent panels in popovers

2018-06-09 14:21:39 +02:00

CMakeLists.txt

Removing Blender Game Engine from Blender 2.8

2018-04-17 17:51:28 +02:00