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

mask data is no longer automatically added when sculpting (except when there is a multi-res modifier).

Browse Source
This commit is contained in:
Campbell Barton
2012-10-01 05:19:57 +00:00
parent a9efe26ab8
commit df298490b8
11 changed files with 191 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/modifiers/intern/MOD_multires.c
View File

@@ -80,6 +80,7 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *dm,
Mesh *me = (Mesh *)ob->data;
const int useRenderParams = flag & MOD_APPLY_RENDER;
MultiresFlags flags = 0;
int has_mask = CustomData_has_layer(&me->ldata, CD_GRID_PAINT_MASK);
if (mmd->totlvl) {
if (!CustomData_get_layer(&me->ldata, CD_MDISPS)) {
@@ -88,7 +89,9 @@ static DerivedMesh *applyModifier(ModifierData *md, Object *ob, DerivedMesh *dm,
}
}
flags = MULTIRES_ALLOC_PAINT_MASK;
if (has_mask)
flags |= MULTIRES_ALLOC_PAINT_MASK;
if (useRenderParams)
flags |= MULTIRES_USE_RENDER_PARAMS;