[Bf-blender-cvs] [f387fe2] master: Cycles: Fix for uninitialized closure data
Sergey Sharybin
noreply at git.blender.org
Thu Sep 3 11:13:37 CEST 2015
Commit: f387fe2b6515513c3891f6533b20a950d908f54b
Author: Sergey Sharybin
Date: Thu Sep 3 13:48:43 2015 +0500
Branches: master
https://developer.blender.org/rBf387fe2b6515513c3891f6533b20a950d908f54b
Cycles: Fix for uninitialized closure data
This might confuse closure merger.
Spotted by Campbell Barton, thanks!
===================================================================
M intern/cycles/kernel/svm/svm_closure.h
===================================================================
diff --git a/intern/cycles/kernel/svm/svm_closure.h b/intern/cycles/kernel/svm/svm_closure.h
index 20105fd..c495ebb 100644
--- a/intern/cycles/kernel/svm/svm_closure.h
+++ b/intern/cycles/kernel/svm/svm_closure.h
@@ -63,6 +63,9 @@ ccl_device_inline ShaderClosure *svm_node_closure_get_non_bsdf(ShaderData *sd, C
if(ccl_fetch(sd, num_closure) < MAX_CLOSURE) {
sc->weight *= mix_weight;
sc->type = type;
+ sc->data0 = 0.0f;
+ sc->data1 = 0.0f;
+ sc->data2 = 0.0f;
#ifdef __OSL__
sc->prim = NULL;
#endif
More information about the Bf-blender-cvs
mailing list