diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-07-06 14:53:35 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-07-06 14:53:35 +0300 |
| commit | 843d5d707deec1c58534c879dca23c03bd64f249 (patch) | |
| tree | 19976afafde93b0284a1d1ae39f94c0231f25abe /source/blender/blenloader | |
| parent | 81a93df6d22c2f148667b9a6e8308e083a4cec39 (diff) | |
| parent | 12ce0cfb21d83b70183a64de47ad05b5775b4937 (diff) | |
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'source/blender/blenloader')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index b3a2d2f0b0b..effaa592080 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -145,6 +145,7 @@ #include "BKE_multires.h" #include "BKE_node.h" // for tree type defines #include "BKE_object.h" +#include "BKE_ocean.h" #include "BKE_paint.h" #include "BKE_particle.h" #include "BKE_pointcache.h" @@ -5224,8 +5225,8 @@ static void direct_link_modifiers(FileData *fd, ListBase *lb) else if (md->type == eModifierType_Ocean) { OceanModifierData *omd = (OceanModifierData *)md; omd->oceancache = NULL; - omd->ocean = NULL; - omd->refresh = (MOD_OCEAN_REFRESH_ADD|MOD_OCEAN_REFRESH_RESET|MOD_OCEAN_REFRESH_SIM); + omd->ocean = BKE_ocean_add(); + omd->refresh = MOD_OCEAN_REFRESH_RESET; } else if (md->type == eModifierType_Warp) { WarpModifierData *tmd = (WarpModifierData *)md; |