Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-01-12 15:09:29 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-01-12 15:09:29 +0300
commit7142bf6cf3beef26f0f67582010e44a829754142 (patch)
tree7c46c3512542f99effb74d9a1e64c9dcec510e88 /intern/cycles/kernel/kernel_subsurface.h
parentac7aefd7c2bc0e87b2787e374d414f18b7887baa (diff)
Cycles: Use proper primitive for the motion subsurface refine
Diffstat (limited to 'intern/cycles/kernel/kernel_subsurface.h')
-rw-r--r--intern/cycles/kernel/kernel_subsurface.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/intern/cycles/kernel/kernel_subsurface.h b/intern/cycles/kernel/kernel_subsurface.h
index 2685cc009df..3693851444e 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],