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)
commit64dd9a117dfabad1a9372d34e8804e7ec1ad9828
treed08580f3bb835a3499471da8478c4a61f1e2b0aa
parentbb0bdc6ce262b6293bd351c97ea05990c9315dd7
parenta247b367b0f7c0486ed8eef4c2a5a753e963ea6c
Merge branch 'master' into blender2.8
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