diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-05-12 09:21:07 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-05-12 09:22:03 +0300 |
| commit | 4dc91ebf81438c473bbd8f9a1655179335c6d42f (patch) | |
| tree | bf254664e6ffcec5e2a4f12417e5a6f0779c4f7e /source/blender/modifiers/intern/MOD_remesh.c | |
| parent | 1813f00b94982727bf545cd4c49ec2d2fee86f7a (diff) | |
| parent | c84b8d480196a8c1d18a46c3e704dc9ce88f5c8b (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/modifiers/intern/MOD_remesh.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_remesh.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/source/blender/modifiers/intern/MOD_remesh.c b/source/blender/modifiers/intern/MOD_remesh.c index 3ee69deb8b2..454b6b3aa82 100644 --- a/source/blender/modifiers/intern/MOD_remesh.c +++ b/source/blender/modifiers/intern/MOD_remesh.c @@ -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; } |