svn merge -r 12937:13095 https://svn.blender.org/svnroot/bf-blender/trunk/blender

[blender-staging.git] / source / blender / src / editmesh.c

diff --git a/source/blender/src/editmesh.c b/source/blender/src/editmesh.c
index 6e0eb42aaf6982321c5f18e7be7c5175ed8e81b5..dc16caa1f59476d84711cf291854fc59e0f23241 100644 (file)
--- a/source/blender/src/editmesh.c
+++ b/source/blender/src/editmesh.c
@@ -65,6 +65,7 @@
 
 #include "BKE_DerivedMesh.h"
 #include "BKE_depsgraph.h"
+#include "BKE_cloth.h"
 #include "BKE_customdata.h"
 #include "BKE_global.h"
 #include "BKE_key.h"
@@ -72,6 +73,7 @@
 #include "BKE_main.h"
 #include "BKE_material.h"
 #include "BKE_mesh.h"
+#include "BKE_modifier.h"
 #include "BKE_multires.h"
 #include "BKE_object.h"
 #include "BKE_texture.h"
@@ -1325,7 +1327,11 @@ void load_editMesh(void)
        if(me->id.us>1) {
                Base *base;
                for(base= G.scene->base.first; base; base= base->next) {
-                       if(base->object->data==me) {
+                       if(base->object->data==me) {                            
+                               if(modifiers_isClothEnabled(base->object)) {
+                                       cloth_free_modifier(modifiers_isClothEnabled(base->object));
+                               }
+                               
                                base->object->softflag |= OB_SB_REDO;
                                base->object->recalc |= OB_RECALC_DATA;
                        }