[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24131] branches/sculpt25/source/blender/ editors: Avoid an unecessary rebuild of the pbvh.

[Nicholas Bishop]

Revision: 24131
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24131
Author:   nicholasbishop
Date:     2009-10-28 08:15:01 +0100 (Wed, 28 Oct 2009)

Log Message:
-----------
Avoid an unecessary rebuild of the pbvh.

Modified Paths:
--------------
    branches/sculpt25/source/blender/editors/sculpt_paint/sculpt.c
    branches/sculpt25/source/blender/editors/space_view3d/view3d_draw.c

Modified: branches/sculpt25/source/blender/editors/sculpt_paint/sculpt.c
===================================================================
--- branches/sculpt25/source/blender/editors/sculpt_paint/sculpt.c	2009-10-28 06:06:05 UTC (rev 24130)
+++ branches/sculpt25/source/blender/editors/sculpt_paint/sculpt.c	2009-10-28 07:15:01 UTC (rev 24131)
@@ -1003,7 +1003,9 @@
 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))) {

Modified: branches/sculpt25/source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- branches/sculpt25/source/blender/editors/space_view3d/view3d_draw.c	2009-10-28 06:06:05 UTC (rev 24130)
+++ branches/sculpt25/source/blender/editors/space_view3d/view3d_draw.c	2009-10-28 07:15:01 UTC (rev 24131)
@@ -1859,8 +1859,8 @@
 			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;