[Bf-blender-cvs] [8641e30] master: Fix T40032: hair BSDF not working correct after primitive type code refactoring.

Brecht Van Lommel noreply at git.blender.org
Mon May 5 17:22:36 CEST 2014


Commit: 8641e3078795768f2eb34673e139d0ac9aa5e88e
Author: Brecht Van Lommel
Date:   Mon May 5 17:14:46 2014 +0200
https://developer.blender.org/rB8641e3078795768f2eb34673e139d0ac9aa5e88e

Fix T40032: hair BSDF not working correct after primitive type code refactoring.

===================================================================

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 fe3fe697..a377087 100644
--- a/intern/cycles/kernel/svm/svm_closure.h
+++ b/intern/cycles/kernel/svm/svm_closure.h
@@ -357,12 +357,14 @@ ccl_device void svm_node_closure_bsdf(KernelGlobals *kg, ShaderData *sd, float *
 					sc->data0 = param1;
 					sc->data1 = param2;
 					sc->offset = -stack_load_float(stack, data_node.z);
-					if(sd->type & PRIMITIVE_ALL_CURVE) {
+
+					if(!(sd->type & PRIMITIVE_ALL_CURVE)) {
 						sc->T = normalize(sd->dPdv);
 						sc->offset = 0.0f;
 					}
 					else
 						sc->T = sd->dPdu;
+
 					if(type == CLOSURE_BSDF_HAIR_REFLECTION_ID) {
 						sd->flag |= bsdf_hair_reflection_setup(sc);
 					}




More information about the Bf-blender-cvs mailing list