Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Sat, 29 Apr 2017 06:32:25 +0000 (16:32 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 29 Apr 2017 06:32:30 +0000 (16:32 +1000)
1  2 
source/blender/editors/interface/interface_handlers.c
source/blender/editors/render/render_opengl.c