Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Tue, 28 Mar 2017 08:41:10 +0000 (10:41 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Tue, 28 Mar 2017 08:41:10 +0000 (10:41 +0200)
commit885260117d6a9080ce073a1fb402b7af060f8645
tree1769a4c180115a0fdda86d5554159c43691f461b
parent6d21970aa06a31398ed4a78b1c596f30a0b9ee87
parente1909958d9ec48333a7bfd0d34aede66efc9b1ad
Merge branch 'master' into blender2.8

Conflicts:
source/blender/blenloader/intern/readfile.c
source/blender/windowmanager/intern/wm_window.c
13 files changed:
intern/cycles/blender/addon/ui.py
intern/ghost/intern/GHOST_WindowWin32.cpp
intern/ghost/intern/GHOST_WindowX11.cpp
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenloader/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/windowmanager/CMakeLists.txt
source/blender/windowmanager/intern/wm_files.c
source/blender/windowmanager/intern/wm_operators.c
source/blender/windowmanager/intern/wm_window.c
source/blender/windowmanager/wm_window.h