[Bf-blender-cvs] [fd341dd6f74] blender2.8: Added copyData flag to ocean modifier

Sybren A. Stüvel noreply at git.blender.org
Wed Jul 4 15:15:14 CEST 2018


Commit: fd341dd6f74e7145d5df725170e886f0f3ef51b7
Author: Sybren A. Stüvel
Date:   Wed Jul 4 15:15:08 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBfd341dd6f74e7145d5df725170e886f0f3ef51b7

Added copyData flag to ocean modifier

===================================================================

M	source/blender/modifiers/intern/MOD_ocean.c

===================================================================

diff --git a/source/blender/modifiers/intern/MOD_ocean.c b/source/blender/modifiers/intern/MOD_ocean.c
index 58454782b2e..e9dc7e068ca 100644
--- a/source/blender/modifiers/intern/MOD_ocean.c
+++ b/source/blender/modifiers/intern/MOD_ocean.c
@@ -163,7 +163,7 @@ static void freeData(ModifierData *md)
 #endif /* WITH_OCEANSIM */
 }
 
-static void copyData(const ModifierData *md, ModifierData *target, const int UNUSED(flag))
+static void copyData(const ModifierData *md, ModifierData *target, const int flag)
 {
 #ifdef WITH_OCEANSIM
 #if 0
@@ -171,7 +171,7 @@ static void copyData(const ModifierData *md, ModifierData *target, const int UNU
 #endif
 	OceanModifierData *tomd = (OceanModifierData *) target;
 
-	modifier_copyData_generic(md, target);
+	modifier_copyData_generic(md, target, flag);
 
 	tomd->refresh = 0;
 
@@ -186,6 +186,7 @@ static void copyData(const ModifierData *md, ModifierData *target, const int UNU
 	/* unused */
 	(void)md;
 	(void)target;
+	(void)flag;
 #endif /* WITH_OCEANSIM */
 }



More information about the Bf-blender-cvs mailing list