Merge branch 'master' into cycles_disney_brdf
authorPascal Schoen <pascal_schoen@gmx.net>
Tue, 6 Sep 2016 13:59:05 +0000 (15:59 +0200)
committerPascal Schoen <pascal_schoen@gmx.net>
Tue, 6 Sep 2016 13:59:05 +0000 (15:59 +0200)
commitcdd29d06bb86672ed0779eefb8eee95796b8f939
treebcc0d875b00fe016144df73161f6398cec900577
parent02c315aeb0f0d7bb429d4396912e03dbb8a77340
parentb40d1c1903207f1c5ba1b7cb3050b4a836c2171d
Merge branch 'master' into cycles_disney_brdf
intern/cycles/render/nodes.h