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

Add a multires function to delete MDisps.

Browse Source 
The code was duplicated in various places, replaced with calls to
a new function, multires_customdata_delete().
This commit is contained in:
Nicholas Bishop
2012-03-19 05:13:41 +00:00
parent 753056d4e8
commit e508c2d9e1
3 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenkernel/BKE_multires.h
View File

@@ -44,6 +44,9 @@ struct MultiresModifierData;
struct Object;
struct Scene;
/* Delete mesh mdisps */
void multires_customdata_delete(struct Mesh *me);
void multires_mark_as_modified(struct Object *ob, enum MultiresModifiedFlags flags);
void multires_force_update(struct Object *ob);

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

@@ -77,6 +77,27 @@ typedef enum {
static void multires_mvert_to_ss(DerivedMesh *dm, MVert *mvert);
static void multiresModifier_disp_run(DerivedMesh *dm, Mesh *me, DerivedMesh *dm2, DispOp op, DMGridData **oldGridData, int totlvl);
/** Customdata **/
void multires_customdata_delete(Mesh *me)
{
if(me->edit_btmesh) {
BMEditMesh *em= me->edit_btmesh;
/* CustomData_external_remove is used here only to mark layer
* as non-external for further free-ing, so zero element count
* looks safer than em->totface */
CustomData_external_remove(&em->bm->ldata, &me->id,
CD_MDISPS, 0);
BM_data_layer_free(em->bm, &em->bm->ldata, CD_MDISPS);
}
else {
CustomData_external_remove(&me->ldata, &me->id,
CD_MDISPS, me->totloop);
CustomData_free_layer_active(&me->ldata, CD_MDISPS,
me->totloop);
}
}
/** Grid hiding **/
static BLI_bitmap multires_mdisps_upsample_hidden(BLI_bitmap lo_hidden,
int lo_level,
@@ -619,8 +640,7 @@ static void multires_del_higher(MultiresModifierData *mmd, Object *ob, int lvl)
}
}
else {
CustomData_external_remove(&me->ldata, &me->id, CD_MDISPS, me->totloop);
CustomData_free_layer_active(&me->ldata, CD_MDISPS, me->totloop);
multires_customdata_delete(me);
}
}
@@ -2005,10 +2025,7 @@ static void multires_sync_levels(Scene *scene, Object *ob, Object *to_ob)
* upsampled correct without modifier data.
* just remove mdisps if no multires present (nazgul) */
Mesh *me= (Mesh*)ob->data;
CustomData_external_remove(&me->ldata, &me->id, CD_MDISPS, me->totloop);
CustomData_free_layer_active(&me->ldata, CD_MDISPS, me->totloop);
multires_customdata_delete(ob->data);
}
if (!mmd || !to_mmd) return;

20
source/blender/editors/object/object_modifier.c
View File

@@ -203,10 +203,9 @@ static int object_modifier_remove(Object *ob, ModifierData *md, int *sort_depsgr
}
else if(md->type == eModifierType_Multires) {
int ok= 1;
Mesh *me= ob->data;
ModifierData *tmpmd;
/* ensure MDISPS CustomData layer is't used by another multires modifiers */
/* ensure MDISPS CustomData layer isn't used by another multires modifiers */
for(tmpmd= ob->modifiers.first; tmpmd; tmpmd= tmpmd->next)
if(tmpmd!=md && tmpmd->type == eModifierType_Multires) {
ok= 0;
@@ -214,16 +213,7 @@ static int object_modifier_remove(Object *ob, ModifierData *md, int *sort_depsgr
}
if(ok) {
if(me->edit_btmesh) {
BMEditMesh *em= me->edit_btmesh;
/* CustomData_external_remove is used here only to mark layer as non-external
* for further free-ing, so zero element count looks safer than em->totface */
CustomData_external_remove(&em->bm->ldata, &me->id, CD_MDISPS, 0);
BM_data_layer_free(em->bm, &em->bm->ldata, CD_MDISPS);
} else {
CustomData_external_remove(&me->ldata, &me->id, CD_MDISPS, me->totloop);
CustomData_free_layer_active(&me->ldata, CD_MDISPS, me->totloop);
}
multires_customdata_delete(ob->data);
}
}
@@ -536,10 +526,8 @@ static int modifier_apply_obdata(ReportList *reports, Scene *scene, Object *ob,
dm->release(dm);
if(md->type == eModifierType_Multires) {
CustomData_external_remove(&me->ldata, &me->id, CD_MDISPS, me->totloop);
CustomData_free_layer_active(&me->ldata, CD_MDISPS, me->totloop);
}
if(md->type == eModifierType_Multires)
multires_customdata_delete(me);
}
}
else if (ELEM(ob->type, OB_CURVE, OB_SURF)) {