Merge remote-tracking branch 'origin/master' into blender2.8
[blender.git] / source / blender / modifiers / intern / MOD_ocean.c
index 4a6b79b71b6a03107503b3fa3198d1d7a06d3a7b..120337eb2eafdb106101b166324de6cc86aafbc5 100644 (file)
@@ -160,40 +160,19 @@ static void freeData(ModifierData *md)
 static void copyData(ModifierData *md, ModifierData *target)
 {
 #ifdef WITH_OCEANSIM
+#if 0
        OceanModifierData *omd = (OceanModifierData *) md;
+#endif
        OceanModifierData *tomd = (OceanModifierData *) target;
 
-       tomd->geometry_mode = omd->geometry_mode;
-       tomd->resolution = omd->resolution;
-       tomd->spatial_size = omd->spatial_size;
-
-       tomd->wind_velocity = omd->wind_velocity;
-
-       tomd->damp = omd->damp;
-       tomd->smallest_wave = omd->smallest_wave;
-       tomd->depth = omd->depth;
+       freeData(target);
 
-       tomd->wave_alignment = omd->wave_alignment;
-       tomd->wave_direction = omd->wave_direction;
-       tomd->wave_scale = omd->wave_scale;
-
-       tomd->chop_amount = omd->chop_amount;
-       tomd->foam_coverage = omd->foam_coverage;
-       tomd->time = omd->time;
-
-       tomd->seed = omd->seed;
-       tomd->flag = omd->flag;
+       modifier_copyData_generic(md, target);
 
        tomd->refresh = 0;
 
-       tomd->size = omd->size;
-       tomd->repeat_x = omd->repeat_x;
-       tomd->repeat_y = omd->repeat_y;
-
        /* XXX todo: copy cache runtime too */
        tomd->cached = 0;
-       tomd->bakestart = omd->bakestart;
-       tomd->bakeend = omd->bakeend;
        tomd->oceancache = NULL;
 
        tomd->ocean = BKE_ocean_add();