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_screw.c
+++ b/source/blender/modifiers/intern/MOD_screw.c
@@ -177,8 +177,9 @@ static void initData(ModifierData *md)
 	ltmd->merge_dist = 0.01f;
 }

-static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx,
-                           Mesh *meshData)
+static Mesh *applyModifier(
+        ModifierData *md, const ModifierEvalContext *ctx,
+        Mesh *meshData)
 {
 	Mesh *mesh = meshData;
 	Mesh *result;