diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-07-10 12:58:01 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-07-10 13:00:58 +0300 |
| commit | 25619443bba4b9dda8e6194662683e91be99b247 (patch) | |
| tree | 5e4a7ec067f414a5b15959a47acd82334eddbe78 /source/blender/blenkernel/intern/ocean.c | |
| parent | 0c8452ad99035fa560a1c19a3b4a404bdbbd9ae6 (diff) | |
Ocean Modifier: prevent crashing on 'Apply Modifier' button
The 'Apply Modifier' button calls the modifier code on the original
object instead of an evaluated copy, which doesn't have an initialised
Ocean *.
Diffstat (limited to 'source/blender/blenkernel/intern/ocean.c')
| -rw-r--r-- | source/blender/blenkernel/intern/ocean.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/ocean.c b/source/blender/blenkernel/intern/ocean.c index b68823626d7..ab0130019b8 100644 --- a/source/blender/blenkernel/intern/ocean.c +++ b/source/blender/blenkernel/intern/ocean.c @@ -836,6 +836,17 @@ struct Ocean *BKE_ocean_add(void) return oc; } +bool BKE_ocean_ensure(struct OceanModifierData *omd) +{ + if (omd->ocean) { + return false; + } + + omd->ocean = BKE_ocean_add(); + BKE_ocean_init_from_modifier(omd->ocean, omd); + return true; +} + void BKE_ocean_init_from_modifier(struct Ocean *ocean, struct OceanModifierData const *omd) { short do_heightfield, do_chop, do_normals, do_jacobian; @@ -1530,6 +1541,11 @@ void BKE_ocean_bake(struct Ocean *UNUSED(o), struct OceanCache *UNUSED(och), /* unused */ (void)update_cb; } + +void BKE_ocean_init_from_modifier(struct Ocean *UNUSED(ocean), struct OceanModifierData const *UNUSED(omd)) +{ +} + #endif /* WITH_OCEANSIM */ void BKE_ocean_free_modifier_cache(struct OceanModifierData *omd) |