Merge branch 'master' into blender2.8
[blender.git] / source / blender / modifiers / intern / MOD_remesh.c
index 3ee69deb8b24f023801781e8af68d897f9c371d0..454b6b3aa82bdf1910bf8d50337c044d4cc937f6 100644 (file)
@@ -133,9 +133,10 @@ static void dualcon_add_quad(void *output_v, const int vert_indices[4])
        output->curface++;
 }
 
-static DerivedMesh *applyModifier(ModifierData *md,
-                                  const ModifierEvalContext *UNUSED(ctx),
-                                  DerivedMesh *dm)
+static DerivedMesh *applyModifier(
+        ModifierData *md,
+        const ModifierEvalContext *UNUSED(ctx),
+        DerivedMesh *dm)
 {
        RemeshModifierData *rmd;
        DualConOutput *output;
@@ -193,9 +194,10 @@ static DerivedMesh *applyModifier(ModifierData *md,
 
 #else /* !WITH_MOD_REMESH */
 
-static DerivedMesh *applyModifier(ModifierData *UNUSED(md),
-                                  const ModifierEvalContext *UNUSED(ctx),
-                                  DerivedMesh *derivedData)
+static DerivedMesh *applyModifier(
+        ModifierData *UNUSED(md),
+        const ModifierEvalContext *UNUSED(ctx),
+        DerivedMesh *derivedData)
 {
        return derivedData;
 }