2.5/Multires:
authorNicholas Bishop <nicholasbishop@gmail.com>
Fri, 3 Jul 2009 15:59:59 +0000 (15:59 +0000)
committerNicholas Bishop <nicholasbishop@gmail.com>
Fri, 3 Jul 2009 15:59:59 +0000 (15:59 +0000)
Missed this somehow when merging the multires branch? Have to make sure that multires displacements are up-to-date before doing a modifier apply.

source/blender/editors/object/object_modifier.c

index a2ea02c24a4a866645bb4be3793406acef7cd6eb..8bdfaeb65199b421ade2278cac2d97b4aeb285b6 100644 (file)
@@ -331,6 +331,10 @@ int ED_object_modifier_apply(ReportList *reports, Scene *scene, Object *ob, Modi
                }
        
                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) {