archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Missed when updating effects to looptri

Browse Source
This commit is contained in:
Campbell Barton
2015-08-01 14:37:20 +10:00
parent c4b2bef163
commit c851d1d045
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/blenkernel/intern/effect.c
View File

@@ -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;
}