Merge branch 'master' into 28
authorCampbell Barton <ideasman42@gmail.com>
Thu, 20 Apr 2017 08:16:01 +0000 (18:16 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 20 Apr 2017 08:16:01 +0000 (18:16 +1000)
commitd8bf0900902b2b523bb50a69b9c669c7d5797d72
treee9c35670312b11b2af91eed605d68bb1e2f4a66b
parent462d9e37ea4d4f9aa5344b4a49d9aa95f7692a10
parent6da53e46c9dc81fcbabd49d1db0f88c5e876cf43
Merge branch 'master' into 28
source/blender/editors/include/UI_interface.h
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_node/drawnode.c
source/blender/editors/space_view3d/drawobject.c
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/intern/wm_operators.c
source/blender/windowmanager/intern/wm_window.c