From 7ce5c951c5bb3607cac2bc603ed9a1fbcc5299dd Mon Sep 17 00:00:00 2001 From: Nicholas Bishop Date: Wed, 28 Oct 2009 07:15:01 +0000 Subject: Avoid an unecessary rebuild of the pbvh. --- source/blender/editors/sculpt_paint/sculpt.c | 4 +++- source/blender/editors/space_view3d/view3d_draw.c | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'source/blender') diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index 28ca5d2fecf..74762379202 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -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))) { diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index 05de5ce1169..202f7634584 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -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; -- cgit v1.2.3