[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21353] branches/blender2.5/blender/source /blender/editors/object/object_modifier.c: 2.5/Multires:

[Nicholas Bishop]

Revision: 21353
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21353
Author:   nicholasbishop
Date:     2009-07-03 17:59:59 +0200 (Fri, 03 Jul 2009)

Log Message:
-----------
2.5/Multires:

Missed this somehow when merging the multires branch? Have to make sure that multires displacements are up-to-date before doing a modifier apply.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/object/object_modifier.c

Modified: branches/blender2.5/blender/source/blender/editors/object/object_modifier.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/object/object_modifier.c	2009-07-03 15:31:23 UTC (rev 21352)
+++ branches/blender2.5/blender/source/blender/editors/object/object_modifier.c	2009-07-03 15:59:59 UTC (rev 21353)
@@ -331,6 +331,10 @@
 		}
 	
 		mesh_pmv_off(ob, me);
+
+               /* Multires: ensure that recent sculpting is applied */
+               if(md->type == eModifierType_Multires)
+                       multires_force_update(ob);
 	
 		dm = mesh_create_derived_for_modifier(scene, ob, md);
 		if (!dm) {