[Bf-blender-cvs] [6dd164a1888] master: Fix T53755: Cycles OpenCL lamp shaders have incorrect normal.

Brecht Van Lommel noreply at git.blender.org
Thu Jan 11 08:48:50 CET 2018


Commit: 6dd164a1888d8e6c2328267e6584575f77527c35
Author: Brecht Van Lommel
Date:   Thu Jan 11 08:42:57 2018 +0100
Branches: master
https://developer.blender.org/rB6dd164a1888d8e6c2328267e6584575f77527c35

Fix T53755: Cycles OpenCL lamp shaders have incorrect normal.

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

M	intern/cycles/kernel/geom/geom_object.h

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

diff --git a/intern/cycles/kernel/geom/geom_object.h b/intern/cycles/kernel/geom/geom_object.h
index d77c40f2348..fa0dff4bd57 100644
--- a/intern/cycles/kernel/geom/geom_object.h
+++ b/intern/cycles/kernel/geom/geom_object.h
@@ -175,6 +175,10 @@ ccl_device_inline void object_inverse_normal_transform(KernelGlobals *kg, const
 		Transform tfm = object_fetch_transform(kg, sd->object, OBJECT_TRANSFORM);
 		*N = normalize(transform_direction_transposed(&tfm, *N));
 	}
+	else if(sd->type == PRIMITIVE_LAMP) {
+		Transform tfm = lamp_fetch_transform(kg, sd->lamp, false);
+		*N = normalize(transform_direction_transposed(&tfm, *N));
+	}
 #endif
 }



More information about the Bf-blender-cvs mailing list