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:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2009-12-10 20:37:04 +0300
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2009-12-10 20:37:04 +0300
commite7bd63c128975b75afa02a31b4b4e962f8d7d2fd (patch)
treefb704f46b845d37ed81f3dacacd7a16022998e18 /source/blender/editors
parentacadb8c39f83a4b4112c8c77bac1eb39584ad100 (diff)
Sculpt Branch:
* Multires 2.50 -> Branch compatibility code converting to the new displacement format. 2.49 -> 2.50 is not functional yet.
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/object/object_modifier.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c
index a0fa0efec0a..a1e70c011fe 100644
--- a/source/blender/editors/object/object_modifier.c
+++ b/source/blender/editors/object/object_modifier.c
@@ -188,6 +188,12 @@ int ED_object_modifier_remove(ReportList *reports, Scene *scene, Object *ob, Mod
else if(md->type == eModifierType_Smoke) {
ob->dt = OB_TEXTURE;
}
+ else if(md->type == eModifierType_Multires) {
+ Mesh *me= ob->data;
+
+ CustomData_external_remove(&me->fdata, &me->id, CD_MDISPS, me->totface);
+ CustomData_free_layer_active(&me->fdata, CD_MDISPS, me->totface);
+ }
BLI_remlink(&ob->modifiers, md);
modifier_free(md);