Merge branch 'master' into 28
authorCampbell Barton <ideasman42@gmail.com>
Wed, 26 Apr 2017 14:58:28 +0000 (00:58 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 26 Apr 2017 14:58:28 +0000 (00:58 +1000)
commitc9d4a0930b4206d736401ca6308ebfcb248d1c33
tree708fbfd1717120638de9de0ef5ceb773e6589a03
parentdc27d31a2100c3272d0dbf293b24131eacaab962
parentbe60e9b8c57223d102bb8b34f1dddc8c454b0ded
Merge branch 'master' into 28
source/blender/blenkernel/intern/object.c
source/blender/editors/render/render_opengl.c