Merge branch 'master' into blender2.8

2018-05-12 08:21:07 +02:00
parent 1813f00b94 c84b8d4801
commit 4dc91ebf81
55 changed files with 519 additions and 388 deletions
--- 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;