Merge branch 'render-layers' of git.blender.org:blender into clay-engine
authorClément Foucault <foucault.clem@gmail.com>
Wed, 25 Jan 2017 11:28:52 +0000 (12:28 +0100)
committerClément Foucault <foucault.clem@gmail.com>
Wed, 25 Jan 2017 11:28:52 +0000 (12:28 +0100)
commit72ff78a9515255c1b687ad3fd63d169ef5c27355
tree56ae2d118761dcc7080a8282e35715d8b83852d3
parentc5ed9434791ec01a65756cd182e15f8744b7e6f3
parent95e9790704c61cb26171f4c7c84673eacd5ac3bd
Merge branch 'render-layers' of git.blender.org:blender into clay-engine

# Conflicts:
# source/blender/editors/space_view3d/drawobject.c
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_280.c
source/blender/editors/space_view3d/space_view3d.c
source/blender/gpu/gawain/batch.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_scene.c