[Bf-blender-cvs] [7142bf6] master: Cycles: Use proper primitive for the motion subsurface refine

Sergey Sharybin noreply at git.blender.org
Tue Jan 12 13:09:55 CET 2016


Commit: 7142bf6cf3beef26f0f67582010e44a829754142
Author: Sergey Sharybin
Date:   Tue Jan 12 17:09:29 2016 +0500
Branches: master
https://developer.blender.org/rB7142bf6cf3beef26f0f67582010e44a829754142

Cycles: Use proper primitive for the motion subsurface refine

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

M	intern/cycles/kernel/kernel_subsurface.h

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

diff --git a/intern/cycles/kernel/kernel_subsurface.h b/intern/cycles/kernel/kernel_subsurface.h
index 2685cc0..3693851 100644
--- a/intern/cycles/kernel/kernel_subsurface.h
+++ b/intern/cycles/kernel/kernel_subsurface.h
@@ -303,11 +303,12 @@ ccl_device int subsurface_scatter_multi_intersect(
 #ifdef __OBJECT_MOTION__
 		else  if(ccl_fetch(sd, type) & PRIMITIVE_MOTION_TRIANGLE) {
 			float3 verts[3];
-			motion_triangle_vertices(kg,
-			                         ccl_fetch(sd, object),
-			                         ccl_fetch(sd, prim),
-			                         ccl_fetch(sd, time),
-			                         verts);
+			motion_triangle_vertices(
+			        kg,
+			        ccl_fetch(sd, object),
+			        kernel_tex_fetch(__prim_index, ss_isect->hits[hit].prim),
+			        ccl_fetch(sd, time),
+			        verts);
 			hit_P = motion_triangle_refine_subsurface(kg,
 			                                          sd,
 			                                          &ss_isect->hits[hit],




More information about the Bf-blender-cvs mailing list