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)
commit33a5248b6c82d7930089544be10480fa0a25aa80
tree8ee84267fae97ac57bdd9d6b3c396e793d77d6fe
parentde9e45a88bd8ceee4af1ea907bb93a3bf22024b9
parent6d73e2d3cf3c9a8fa4c73e04d02caecfd716e962
Merge branch 'master' into blender2.8
source/blender/editors/interface/interface_handlers.c
source/blender/editors/render/render_opengl.c