[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39787] branches/bmesh/blender/source/ blender/editors/sculpt_paint: =bmesh= sculpt without multires updates properly now.

[Joseph Eagar]

Revision: 39787
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39787
Author:   joeedh
Date:     2011-08-30 02:33:27 +0000 (Tue, 30 Aug 2011)
Log Message:
-----------
=bmesh= sculpt without multires updates properly now.  not sure I did this correctly, though.

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/editors/sculpt_paint/sculpt.c
    branches/bmesh/blender/source/blender/editors/sculpt_paint/sculpt_undo.c

Modified: branches/bmesh/blender/source/blender/editors/sculpt_paint/sculpt.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/sculpt_paint/sculpt.c	2011-08-30 02:11:19 UTC (rev 39786)
+++ branches/bmesh/blender/source/blender/editors/sculpt_paint/sculpt.c	2011-08-30 02:33:27 UTC (rev 39787)
@@ -3389,7 +3389,7 @@
 	if(ob->derivedFinal) /* VBO no longer valid */
 		GPU_drawobject_free(ob->derivedFinal);
 
-	if (!ss->cache)
+	if (!ss->cache || !mmd)
 		DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	
 	if(ss->modifiers_active) {

Modified: branches/bmesh/blender/source/blender/editors/sculpt_paint/sculpt_undo.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/sculpt_paint/sculpt_undo.c	2011-08-30 02:11:19 UTC (rev 39786)
+++ branches/bmesh/blender/source/blender/editors/sculpt_paint/sculpt_undo.c	2011-08-30 02:33:27 UTC (rev 39787)
@@ -193,7 +193,7 @@
 		if((mmd=sculpt_multires_active(scene, ob)))
 			multires_mark_as_modified(ob);
 
-		tag_update= ((Mesh*)ob->data)->id.us > 1;
+		tag_update= ((Mesh*)ob->data)->id.us > 1 || !mmd;
 
 		if(ss->modifiers_active) {
 			Mesh *mesh= ob->data;