Merge branch 'render-layers' into clay-engine
authorDalai Felinto <dfelinto@gmail.com>
Tue, 31 Jan 2017 14:06:51 +0000 (15:06 +0100)
committerDalai Felinto <dfelinto@gmail.com>
Tue, 31 Jan 2017 14:06:51 +0000 (15:06 +0100)
1  2 
source/blender/blenkernel/BKE_layer.h

Simple merge