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

Conflicts:
	source/blender/collada/ArmatureExporter.cpp
	source/blender/collada/ArmatureExporter.h
	source/blender/collada/DocumentExporter.cpp
	source/blender/collada/DocumentExporter.h
	source/blender/collada/SceneExporter.cpp
	source/blender/collada/SceneExporter.h
	source/blender/collada/collada.cpp
	source/blender/collada/collada.h
	source/blender/editors/armature/armature_edit.c
	source/blender/editors/armature/editarmature_retarget.c
	source/blender/editors/armature/pose_transform.c
	source/blender/editors/include/ED_armature.h
	source/blender/editors/include/ED_object.h
	source/blender/editors/include/ED_screen.h
	source/blender/editors/io/io_collada.c
	source/blender/editors/object/object_transform.c
	source/blender/editors/screen/screen_edit.c
	source/blender/editors/screen/screen_ops.c
	source/blender/windowmanager/intern/wm.c
	source/blender/windowmanager/intern/wm_files.c
	source/blender/windowmanager/intern/wm_window.c
	source/blenderplayer/bad_level_call_stubs/stubs.c

2018-06-06 16:25:28 +02:00

..

blender

Merge branch 'master' into blender2.8

2018-06-06 16:25:28 +02:00

creator

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

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

tools @ fca325137b

Cleanup: style

2018-06-05 21:32:49 +02:00

CMakeLists.txt

Removing Blender Game Engine from Blender 2.8

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