Avoid an unecessary rebuild of the pbvh.
authorNicholas Bishop <nicholasbishop@gmail.com>
Wed, 28 Oct 2009 07:15:01 +0000 (07:15 +0000)
committerNicholas Bishop <nicholasbishop@gmail.com>
Wed, 28 Oct 2009 07:15:01 +0000 (07:15 +0000)
source/blender/editors/sculpt_paint/sculpt.c
source/blender/editors/space_view3d/view3d_draw.c

index 28ca5d2fecf9366e6a2f54d9f463a2d660781283..74762379202ecce377e56a7d53d7b17df0709633 100644 (file)
@@ -1003,7 +1003,9 @@ static struct MultiresModifierData *sculpt_multires_active(Object *ob)
 static void sculpt_update_mesh_elements(bContext *C)
 {
        Object *ob = CTX_data_active_object(C);
-       DerivedMesh *dm = mesh_get_derived_final(CTX_data_scene(C), ob, CD_MASK_BAREMESH);
+       DerivedMesh *dm =
+               mesh_get_derived_final(CTX_data_scene(C), ob,
+                                      CTX_wm_view3d(C)->customdata_mask);
        SculptSession *ss = ob->sculpt;
 
        if((ss->multires = sculpt_multires_active(ob))) {
index 05de5ce1169236eb43a02b3d1576304a910f9c61..202f7634584e3eab72ed1f0917e39cd18c16a5e5 100644 (file)
@@ -1859,8 +1859,8 @@ static CustomDataMask get_viewedit_datamask(bScreen *screen, Scene *scene, Objec
                        mask |= CD_MASK_MCOL;
                if(ob->mode & OB_MODE_WEIGHT_PAINT)
                        mask |= CD_MASK_WEIGHT_MCOL;
-               if(ob->mode & OB_MODE_SCULPT)
-                       mask |= CD_MASK_MDISPS;
+               //if(ob->mode & OB_MODE_SCULPT)
+               //      mask |= CD_MASK_MDISPS;
        }
 
        return mask;