Merge remote-tracking branch 'origin/clay-engine' into render-layers
authorDalai Felinto <dfelinto@gmail.com>
Fri, 3 Feb 2017 16:22:51 +0000 (17:22 +0100)
committerDalai Felinto <dfelinto@gmail.com>
Fri, 3 Feb 2017 16:22:51 +0000 (17:22 +0100)
commit16385ae285688c5d1634fa4964bea9854ef96764
treef6c9a832de6ade36de4206c7bc65ce3a7016da7e
parenteaf9748f23f2ccb3dd95ea73859479be2fe0d769
parent2b04710d61bd12598ec397ad402b85cc9fb72c12
Merge remote-tracking branch 'origin/clay-engine' into render-layers
source/blender/blenkernel/intern/layer.c