Merge branch 'master' into blender2.8

1 files changed, 11 insertions, 8 deletions

diff --git a/source/blender/modifiers/intern/MOD_ocean.c b/source/blender/modifiers/intern/MOD_ocean.c
index debd2fb6b46..728802882a9 100644
--- a/source/blender/modifiers/intern/MOD_ocean.c
+++ b/source/blender/modifiers/intern/MOD_ocean.c
@@ -403,9 +403,10 @@ static DerivedMesh *generate_ocean_geometry(OceanModifierData *omd)
 	return result;
 }
 
-static DerivedMesh *doOcean(ModifierData *md, Object *ob,
-                            DerivedMesh *derivedData,
-                            int UNUSED(useRenderParams))
+static DerivedMesh *doOcean(
+        ModifierData *md, Object *ob,
+        DerivedMesh *derivedData,
+        int UNUSED(useRenderParams))
 {
 	OceanModifierData *omd = (OceanModifierData *) md;
 
@@ -543,9 +544,10 @@ static DerivedMesh *doOcean(ModifierData *md, Object *ob,
 	return dm;
 }
 #else  /* WITH_OCEANSIM */
-static DerivedMesh *doOcean(ModifierData *md, Object *UNUSED(ob),
-                            DerivedMesh *derivedData,
-                            int UNUSED(useRenderParams))
+static DerivedMesh *doOcean(
+        ModifierData *md, Object *UNUSED(ob),
+        DerivedMesh *derivedData,
+        int UNUSED(useRenderParams))
 {
 	/* unused */
 	(void)md;
@@ -553,8 +555,9 @@ static DerivedMesh *doOcean(ModifierData *md, Object *UNUSED(ob),
 }
 #endif /* WITH_OCEANSIM */
 
-static DerivedMesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx,
-                                  DerivedMesh *derivedData)
+static DerivedMesh *applyModifier(
+        ModifierData *md, const ModifierEvalContext *ctx,
+        DerivedMesh *derivedData)
 {
 	DerivedMesh *result;