Commit: c256072e911d0ce7d70be38b49d21986be16f11a
Author: Sergey Sharybin
Date: Thu Aug 14 11:40:31 2014 +0600
Branches: master
https://developer.blender.org/rBc256072e911d0ce7d70be38b49d21986be16f11a
Cycles: Correction to previous commit -- forgot to take instancing into account
===================================================================
M intern/cycles/kernel/geom/geom_triangle.h
===================================================================
diff --git a/intern/cycles/kernel/geom/geom_triangle.h
b/intern/cycles/kernel/geom/geom_triangle.h
index 35dd5b2..41e9d18 100644
--- a/intern/cycles/kernel/geom/geom_triangle.h
+++ b/intern/cycles/kernel/geom/geom_triangle.h
@@ -147,8 +147,10 @@ ccl_device_inline void triangle_point_normal(KernelGlobals
*kg, int object, int
float t = 1.0f - u - v;
*P = (u*v0 + v*v1 + t*v2);
+ /* get object flags, instance-aware */
+ int object_flag = kernel_tex_fetch(__object_flag, object >= 0 ? object
: ~object);
+
/* compute normal */
- int object_flag = kernel_tex_fetch(__object_flag, object);
if(object_flag & SD_NEGATIVE_SCALE_APPLIED)
*Ng = normalize(cross(v2 - v0, v1 - v0));
else
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
