Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2013-11-29 20:17:00 +0400
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2013-11-29 20:18:43 +0400
commit4d6c877b66903877ca379067299ed7cebdf8a94f (patch)
tree2e22094d346d9d8eb06b48efb0b608f7ba1e7be1 /intern/cycles/kernel/osl/osl_shader.cpp
parent3bf77c34eb2be69955afa7f8b7fb014a186ea09c (diff)
Cycles OSL: fix mistake in recent refactoring, parameters are not set before setup.
Diffstat (limited to 'intern/cycles/kernel/osl/osl_shader.cpp')
-rw-r--r--intern/cycles/kernel/osl/osl_shader.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/intern/cycles/kernel/osl/osl_shader.cpp b/intern/cycles/kernel/osl/osl_shader.cpp
index 146736ba799..f2be61eb535 100644
--- a/intern/cycles/kernel/osl/osl_shader.cpp
+++ b/intern/cycles/kernel/osl/osl_shader.cpp
@@ -156,6 +156,8 @@ static void flatten_surface_closure_tree(ShaderData *sd, int path_flag,
sc.weight = weight;
#endif
+ prim->setup();
+
switch (prim->category) {
case CClosurePrimitive::BSDF: {
CBSDFClosure *bsdf = (CBSDFClosure *)prim;
@@ -395,6 +397,8 @@ static void flatten_volume_closure_tree(ShaderData *sd,
sc.weight = weight;
#endif
+ prim->setup();
+
switch (prim->category) {
case CClosurePrimitive::Volume: {
/* sample weight */