[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33633] trunk/blender/source/blender: Use mdisps layer from edit_mesh when adding/removing multires modifier

[Sergey Sharybin]

Revision: 33633
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33633
Author:   nazgul
Date:     2010-12-13 11:24:05 +0100 (Mon, 13 Dec 2010)

Log Message:
-----------
Use mdisps layer from edit_mesh when adding/removing multires modifier
when object is in edit mode.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/multires.c
    trunk/blender/source/blender/editors/object/object_modifier.c

Modified: trunk/blender/source/blender/blenkernel/intern/multires.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/multires.c   2010-12-13 
09:39:14 UTC (rev 33632)
+++ trunk/blender/source/blender/blenkernel/intern/multires.c   2010-12-13 
10:24:05 UTC (rev 33633)
@@ -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 @@
        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);

Modified: trunk/blender/source/blender/editors/object/object_modifier.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_modifier.c       
2010-12-13 09:39:14 UTC (rev 33632)
+++ trunk/blender/source/blender/editors/object/object_modifier.c       
2010-12-13 10:24:05 UTC (rev 33633)
@@ -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 @@
        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) &&


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs