Merge branch 'master' into blender2.8
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 27 Sep 2018 12:51:33 +0000 (14:51 +0200)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 27 Sep 2018 12:51:33 +0000 (14:51 +0200)
commit4de1e673a411d14c5ab980d37cc3e1bb8b3d99ea
treef4f84a3813247e9b8ba07ade7fbce3e52fd4d48d
parent1472550ba195a3278ee3eb2977515c2c3b62c9ce
parent8f9a6b1bab89b9af821b3996514af7de7c8cce7c
Merge branch 'master' into blender2.8
intern/ghost/GHOST_C-api.h
intern/ghost/GHOST_ISystem.h
intern/ghost/intern/GHOST_C-api.cpp
intern/ghost/intern/GHOST_System.cpp
intern/ghost/intern/GHOST_SystemCocoa.mm
intern/ghost/intern/GHOST_WindowWin32.cpp
intern/ghost/intern/GHOST_WindowX11.cpp
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/intern/wm_window.c
source/creator/creator_args.c