Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Bishop <nicholasbishop@gmail.com>2009-07-03 19:59:59 +0400
committerNicholas Bishop <nicholasbishop@gmail.com>2009-07-03 19:59:59 +0400
commit815fef5e7e4f0cd018193f6ee13292d6c4e1f2b0 (patch)
treeace61ae33c8dd73858364efdf9ffaadda396d747
parent9e71b736ebcae9bcdc6fa239722858d1828a1ac2 (diff)
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.
-rw-r--r--source/blender/editors/object/object_modifier.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index a2ea02c24a4..8bdfaeb6519 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -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) {