Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 11 Jul 2017 04:21:05 +0000 (14:21 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 11 Jul 2017 04:21:05 +0000 (14:21 +1000)
1  2 
source/blender/blenkernel/intern/scene.c
source/blender/editors/space_image/image_ops.c
source/blender/editors/space_view3d/drawobject.c
source/blender/render/intern/source/pipeline.c