Commit: c851d1d04552e02a64b81216099ee01991f168d7
Author: Campbell Barton
Date: Sat Aug 1 14:37:20 2015 +1000
Branches: master
https://developer.blender.org/rBc851d1d04552e02a64b81216099ee01991f168d7
Missed when updating effects to looptri
===================================================================
M source/blender/blenkernel/intern/effect.c
===================================================================
diff --git a/source/blender/blenkernel/intern/effect.c
b/source/blender/blenkernel/intern/effect.c
index 785561d..b0b9372 100644
--- a/source/blender/blenkernel/intern/effect.c
+++ b/source/blender/blenkernel/intern/effect.c
@@ -542,15 +542,14 @@ int closest_point_on_surface(SurfaceModifierData *surmd,
const float co[3], floa
}
if (surface_vel) {
- MFace *mface = CDDM_get_tessface(surmd->dm,
nearest.index);
+ const MLoop *mloop = surmd->bvhtree->loop;
+ const MLoopTri *lt =
&surmd->bvhtree->looptri[nearest.index];
- copy_v3_v3(surface_vel, surmd->v[mface->v1].co);
- add_v3_v3(surface_vel, surmd->v[mface->v2].co);
- add_v3_v3(surface_vel, surmd->v[mface->v3].co);
- if (mface->v4)
- add_v3_v3(surface_vel, surmd->v[mface->v4].co);
+ copy_v3_v3(surface_vel,
surmd->v[mloop[lt->tri[0]].v].co);
+ add_v3_v3(surface_vel,
surmd->v[mloop[lt->tri[1]].v].co);
+ add_v3_v3(surface_vel,
surmd->v[mloop[lt->tri[2]].v].co);
- mul_v3_fl(surface_vel, mface->v4 ? 0.25f : (1.0f /
3.0f));
+ mul_v3_fl(surface_vel, (1.0f / 3.0f));
}
return 1;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
