griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T37541: multires not reading external displacement file after entering edit mode.

Browse Source
This commit is contained in:
Brecht Van Lommel
2013-11-26 17:09:15 +01:00
parent b65eb761cc
commit 5102a02b38
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/blenkernel/intern/customdata.c
View File

@@ -507,16 +507,15 @@ 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].hidden = MEM_dupallocN(s[i].hidden);
d[i].totdisp = s[i].totdisp;
d[i].level = s[i].level;
}
else {
d[i].disps = NULL;
d[i].hidden = NULL;
d[i].totdisp = 0;
d[i].level = 0;
}
/* still copy even if not in memory, displacement can be external */
d[i].totdisp = s[i].totdisp;
d[i].level = s[i].level;
}
}

2
source/blender/blenkernel/intern/multires.c
View File

@@ -2288,7 +2288,7 @@ void multires_topology_changed(Mesh *me)
MDisps *mdisp = NULL, *cur = NULL;
int i, grid = 0;
CustomData_external_read(&me->ldata, &me->id, CD_MASK_MDISPS, me->totface);
CustomData_external_read(&me->ldata, &me->id, CD_MASK_MDISPS, me->totloop);
mdisp = CustomData_get_layer(&me->ldata, CD_MDISPS);
if (!mdisp)