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_multires.c | |
| parent | 1813f00b94982727bf545cd4c49ec2d2fee86f7a (diff) | |
| parent | c84b8d480196a8c1d18a46c3e704dc9ce88f5c8b (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/modifiers/intern/MOD_multires.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_multires.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/modifiers/intern/MOD_multires.c b/source/blender/modifiers/intern/MOD_multires.c index 17336c2a723..c263c2e3f5d 100644 --- a/source/blender/modifiers/intern/MOD_multires.c +++ b/source/blender/modifiers/intern/MOD_multires.c @@ -58,8 +58,9 @@ static void initData(ModifierData *md) mmd->totlvl = 0; } -static DerivedMesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, - DerivedMesh *dm) +static DerivedMesh *applyModifier( + ModifierData *md, const ModifierEvalContext *ctx, + DerivedMesh *dm) { MultiresModifierData *mmd = (MultiresModifierData *)md; DerivedMesh *result; |