Merge branch 'blender2.8' into blender2.8-workbench
authorJeroen Bakker <j.bakker@atmind.nl>
Mon, 16 Apr 2018 18:35:59 +0000 (20:35 +0200)
committerJeroen Bakker <j.bakker@atmind.nl>
Mon, 16 Apr 2018 18:35:59 +0000 (20:35 +0200)
1  2 
source/blender/blenkernel/intern/scene.c
source/blender/draw/CMakeLists.txt
source/blender/draw/intern/draw_manager.c

Simple merge