=bmesh= merge from trunk at r36529
[blender.git] / source / blender / modifiers / intern / MOD_explode.c
index 46a94a023b11ea9a4bb2e01076080e747e654a45..38570f2248f506537f7b55243a1a7cffb6fee88f 100644 (file)
@@ -1001,19 +1001,19 @@ static DerivedMesh * applyModifier(ModifierData *md, Object *ob,
 
                        createFacepa(emd,psmd,derivedData);
                }
-                                /* 2. create new mesh */
-                                if(emd->flag & eExplodeFlag_EdgeCut){
-                                        int *facepa = emd->facepa;
-                                        DerivedMesh *splitdm=cutEdges(emd,dm);
-                                        DerivedMesh *explode=explodeMesh(emd, psmd, md->scene, ob, splitdm);
-
-                                        MEM_freeN(emd->facepa);
-                                        emd->facepa=facepa;
-                                        splitdm->release(splitdm);
-                                        return explode;
-                                }
-                                else
-                                        return explodeMesh(emd, psmd, md->scene, ob, derivedData);
+               /* 2. create new mesh */
+               if(emd->flag & eExplodeFlag_EdgeCut){
+                       int *facepa = emd->facepa;
+                       DerivedMesh *splitdm=cutEdges(emd,dm);
+                       DerivedMesh *explode=explodeMesh(emd, psmd, md->scene, ob, splitdm);
+
+                       MEM_freeN(emd->facepa);
+                       emd->facepa=facepa;
+                       splitdm->release(splitdm);
+                       return explode;
+               }
+               else
+                       return explodeMesh(emd, psmd, md->scene, ob, derivedData);
        }
        return derivedData;
 }
@@ -1023,7 +1023,7 @@ ModifierTypeInfo modifierType_Explode = {
        /* name */              "Explode",
        /* structName */        "ExplodeModifierData",
        /* structSize */        sizeof(ExplodeModifierData),
-       /* type */              eModifierTypeType_Nonconstructive,
+       /* type */              eModifierTypeType_Constructive,
        /* flags */             eModifierTypeFlag_AcceptsMesh,
        /* copyData */          copyData,
        /* deformVerts */       NULL,