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/blenkernel/intern/customdata.c | |
| 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/blenkernel/intern/customdata.c')
| -rw-r--r-- | source/blender/blenkernel/intern/customdata.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index 233d0202540..2520c9b666e 100644 --- a/source/blender/blenkernel/intern/customdata.c +++ b/source/blender/blenkernel/intern/customdata.c @@ -485,10 +485,12 @@ static void layerCopy_mdisps(const void *source, void *dest, int count) if(s[i].disps) { d[i].disps = MEM_dupallocN(s[i].disps); d[i].totdisp = s[i].totdisp; + d[i].level = s[i].level; } else { d[i].disps = NULL; d[i].totdisp = 0; + d[i].level = 0; } } @@ -504,6 +506,7 @@ static void layerFree_mdisps(void *data, int count, int UNUSED(size)) MEM_freeN(d[i].disps); d[i].disps = NULL; d[i].totdisp = 0; + d[i].level = 0; } } |