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:
authorNicholas Bishop <nicholasbishop@gmail.com>2012-03-14 10:31:38 +0400
committerNicholas Bishop <nicholasbishop@gmail.com>2012-03-14 10:31:38 +0400
commit82840ef94bce87684b0fcebcc47eb11d3771c1d3 (patch)
treedc8a883b8f7efa885ee9fc9a672f1b765d27dc5c /source/blender/blenkernel/intern/customdata.c
parent0c918213646734acbbda110dca3fa2e2198b3894 (diff)
Add MDisps.hidden bitmap.
Updates SDNA, customdata functions, and file read/write. Also adds accessor functions to BKE paint.
Diffstat (limited to 'source/blender/blenkernel/intern/customdata.c')
-rw-r--r--source/blender/blenkernel/intern/customdata.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c
index 2520c9b666e..e7af73c5e0f 100644
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@ -484,6 +484,7 @@ static void layerCopy_mdisps(const void *source, void *dest, int count)
for(i = 0; i < count; ++i) {
if(s[i].disps) {
d[i].disps = MEM_dupallocN(s[i].disps);
+ d[i].hidden = MEM_dupallocN(s[i].hidden);
d[i].totdisp = s[i].totdisp;
d[i].level = s[i].level;
}
@@ -504,7 +505,10 @@ static void layerFree_mdisps(void *data, int count, int UNUSED(size))
for(i = 0; i < count; ++i) {
if(d[i].disps)
MEM_freeN(d[i].disps);
+ if(d[i].hidden)
+ MEM_freeN(d[i].hidden);
d[i].disps = NULL;
+ d[i].hidden = NULL;
d[i].totdisp = 0;
d[i].level = 0;
}