Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSybren A. Stüvel <sybren@stuvel.eu>2018-07-06 14:53:35 +0300
committerSybren A. Stüvel <sybren@stuvel.eu>2018-07-06 14:53:35 +0300
commit843d5d707deec1c58534c879dca23c03bd64f249 (patch)
tree19976afafde93b0284a1d1ae39f94c0231f25abe /source/blender/modifiers/intern/MOD_ocean.c
parent81a93df6d22c2f148667b9a6e8308e083a4cec39 (diff)
parent12ce0cfb21d83b70183a64de47ad05b5775b4937 (diff)
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'source/blender/modifiers/intern/MOD_ocean.c')
-rw-r--r--source/blender/modifiers/intern/MOD_ocean.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/source/blender/modifiers/intern/MOD_ocean.c b/source/blender/modifiers/intern/MOD_ocean.c
index e9dc7e068ca..52bd3e874b6 100644
--- a/source/blender/modifiers/intern/MOD_ocean.c
+++ b/source/blender/modifiers/intern/MOD_ocean.c
@@ -437,9 +437,6 @@ static DerivedMesh *doOcean(
}
/* update modifier */
- if (omd->refresh & MOD_OCEAN_REFRESH_ADD) {
- omd->ocean = BKE_ocean_add();
- }
if (omd->refresh & MOD_OCEAN_REFRESH_RESET) {
init_ocean_modifier(omd);
}