diff options
author | Nicholas Bishop <nicholasbishop@gmail.com> | 2012-03-14 07:10:18 +0400 |
---|---|---|
committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2012-03-14 07:10:18 +0400 |
commit | 99f72dfbfcb004418ae3c701f3badfd36996e6e5 (patch) | |
tree | 15fb556342a58a1a947bd087c11d39f7afa4f95b /source/blender/bmesh | |
parent | f80fa544281afb22815ca083d0badd3a9979d17d (diff) |
Add 'level' field to struct MDisps, companion to 'totdisp'.
Gets initialized when loading old files and updated at the same places
totdisp is updated. Saves having to do log+sqrt to extract level from
totdisp.
Diffstat (limited to 'source/blender/bmesh')
-rw-r--r-- | source/blender/bmesh/intern/bmesh_interp.c | 1 | ||||
-rw-r--r-- | source/blender/bmesh/intern/bmesh_mesh.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/bmesh/intern/bmesh_interp.c b/source/blender/bmesh/intern/bmesh_interp.c index 7074adc324f..5b8b537c669 100644 --- a/source/blender/bmesh/intern/bmesh_interp.c +++ b/source/blender/bmesh/intern/bmesh_interp.c @@ -426,6 +426,7 @@ static void bm_loop_interp_mdisps(BMesh *bm, BMLoop *target, BMFace *source) MDisps *md2 = CustomData_bmesh_get(&bm->ldata, BM_FACE_FIRST_LOOP(source)->head.data, CD_MDISPS); mdisps->totdisp = md2->totdisp; + mdisps->level = md2->level; if (mdisps->totdisp) { mdisps->disps = MEM_callocN(sizeof(float) * 3 * mdisps->totdisp, "mdisp->disps in bmesh_loop_intern_mdisps"); diff --git a/source/blender/bmesh/intern/bmesh_mesh.c b/source/blender/bmesh/intern/bmesh_mesh.c index 04279d30e61..096c1fabc5e 100644 --- a/source/blender/bmesh/intern/bmesh_mesh.c +++ b/source/blender/bmesh/intern/bmesh_mesh.c @@ -371,6 +371,7 @@ static void UNUSED_FUNCTION(bm_mdisps_space_set)(Object *ob, BMesh *bm, int from lmd->disps = MEM_dupallocN(mdisps->disps); lmd->totdisp = mdisps->totdisp; + lmd->level = mdisps->level; } mdisps++; |