Merge remote-tracking branch 'origin/blender2.8' into render-layers
authorDalai Felinto <dfelinto@gmail.com>
Wed, 25 Jan 2017 09:17:38 +0000 (10:17 +0100)
committerDalai Felinto <dfelinto@gmail.com>
Wed, 25 Jan 2017 09:17:38 +0000 (10:17 +0100)
1  2 
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/scene.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/space_view3d.c
source/blender/editors/transform/transform_conversions.c