diff options
author | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-07-10 12:57:01 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-07-10 13:00:58 +0300 |
commit | 0c8452ad99035fa560a1c19a3b4a404bdbbd9ae6 (patch) | |
tree | abcb66f6c12e5f31d546a5b20a3f10ad9f769956 /source/blender/editors | |
parent | de55ae56ae5d871b5bc7fa6383c90ef89d66fcd1 (diff) |
Ocean Modifier: removed duplicated code
Some code was copied with 'keep in sync with xxx' comments added to it.
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/object/object_modifier.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index e50efcf20ee..5ee30992621 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -2062,25 +2062,6 @@ static bool ocean_bake_poll(bContext *C) return edit_modifier_poll_generic(C, &RNA_OceanModifier, 0); } -/* copied from init_ocean_modifier, MOD_ocean.c */ -static void init_ocean_modifier_bake(struct Ocean *oc, struct OceanModifierData *omd) -{ - int do_heightfield, do_chop, do_normals, do_jacobian; - - if (!omd || !oc) return; - - do_heightfield = true; - do_chop = (omd->chop_amount > 0); - do_normals = (omd->flag & MOD_OCEAN_GENERATE_NORMALS); - do_jacobian = (omd->flag & MOD_OCEAN_GENERATE_FOAM); - - BKE_ocean_init(oc, omd->resolution * omd->resolution, omd->resolution * omd->resolution, omd->spatial_size, omd->spatial_size, - omd->wind_velocity, omd->smallest_wave, 1.0, omd->wave_direction, omd->damp, omd->wave_alignment, - omd->depth, omd->time, - do_heightfield, do_chop, do_normals, do_jacobian, - omd->seed); -} - typedef struct OceanBakeJob { /* from wmJob */ struct Object *owner; @@ -2213,7 +2194,7 @@ static int ocean_bake_exec(bContext *C, wmOperator *op) /* make a copy of ocean to use for baking - threadsafety */ ocean = BKE_ocean_add(); - init_ocean_modifier_bake(ocean, omd); + BKE_ocean_init_from_modifier(ocean, omd); #if 0 BKE_ocean_bake(ocean, och); |