archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Use mdisps layer from edit_mesh when adding/removing multires modifier

Browse Source 
when object is in edit mode.
This commit is contained in:
Sergey Sharybin
2010-12-13 10:24:05 +00:00
parent 4cd06a6526
commit c85adcc2e4
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,6 +37,7 @@
#include "BLI_blenlib.h"
#include "BLI_math.h"
#include "BLI_pbvh.h"
#include "BLI_editVert.h"
#include "BKE_cdderivedmesh.h"
#include "BKE_mesh.h"
@@ -278,7 +279,10 @@ void multiresModifier_set_levels_from_disps(MultiresModifierData *mmd, Object *o
Mesh *me = ob->data;
MDisps *mdisp;
mdisp = CustomData_get_layer(&me->fdata, CD_MDISPS);
if(me->edit_mesh)
mdisp = CustomData_get_layer(&me->edit_mesh->fdata, CD_MDISPS);
else
mdisp = CustomData_get_layer(&me->fdata, CD_MDISPS);
if(mdisp) {
mmd->totlvl = get_levels_from_disps(ob);

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

@@ -42,6 +42,7 @@
#include "BLI_listbase.h"
#include "BLI_string.h"
#include "BLI_path_util.h"
#include "BLI_editVert.h"
#include "BKE_curve.h"
#include "BKE_context.h"
@@ -68,6 +69,7 @@
#include "ED_armature.h"
#include "ED_object.h"
#include "ED_screen.h"
#include "ED_mesh.h"
#include "WM_api.h"
#include "WM_types.h"
@@ -192,8 +194,16 @@ int ED_object_modifier_remove(ReportList *reports, Main *bmain, Scene *scene, Ob
else if(md->type == eModifierType_Multires) {
Mesh *me= ob->data;
CustomData_external_remove(&me->fdata, &me->id, CD_MDISPS, me->totface);
CustomData_free_layer_active(&me->fdata, CD_MDISPS, me->totface);
if(me->edit_mesh) {
EditMesh *em= me->edit_mesh;
/* 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->fdata, &me->id, CD_MDISPS, 0);
EM_free_data_layer(em, &em->fdata, CD_MDISPS);
} else {
CustomData_external_remove(&me->fdata, &me->id, CD_MDISPS, me->totface);
CustomData_free_layer_active(&me->fdata, CD_MDISPS, me->totface);
}
}
if(ELEM(md->type, eModifierType_Softbody, eModifierType_Cloth) &&