Merge remote-tracking branch 'origin/render-layers' into clay-engine
authorClément Foucault <foucault.clem@gmail.com>
Thu, 5 Jan 2017 10:28:28 +0000 (11:28 +0100)
committerClément Foucault <foucault.clem@gmail.com>
Thu, 5 Jan 2017 10:28:28 +0000 (11:28 +0100)
commitc9903645598bbc0d30a320a5d0439fcd102d94db
tree423176ce581358f406f2dc3b8d3e33977423a6ef
parent624f3c254f2b70fd78bbf7b562a7c6b156db78b8
parentd80372c9f4908a358733dc7db35652d18a15ed8e
Merge remote-tracking branch 'origin/render-layers' into clay-engine
source/blender/CMakeLists.txt
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_intern.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_scene.c