diff options
author | Jacques Lucke <jacques@blender.org> | 2020-03-07 21:00:01 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2020-03-07 21:00:01 +0300 |
commit | dc3b6617bb61e54f576b28363795bafade477026 (patch) | |
tree | b0041f630ee36341b8e5a1dbefd983794d6a297f | |
parent | d912bb9cce426874fe14af8fa63e2721d535a6a2 (diff) |
update ocean modifier
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 5 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_meshsequencecache.c | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_ocean.c | 11 |
3 files changed, 11 insertions, 7 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 5ebee83547a..a54a5106b18 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -5420,11 +5420,6 @@ static void direct_link_modifiers(FileData *fd, ListBase *lb, Object *ob) psmd->facepa = NULL; } - else if (md->type == eModifierType_Ocean) { - OceanModifierData *omd = (OceanModifierData *)md; - omd->oceancache = NULL; - omd->ocean = NULL; - } } } diff --git a/source/blender/modifiers/intern/MOD_meshsequencecache.c b/source/blender/modifiers/intern/MOD_meshsequencecache.c index 9cfee8de99b..dbd1f6f3f75 100644 --- a/source/blender/modifiers/intern/MOD_meshsequencecache.c +++ b/source/blender/modifiers/intern/MOD_meshsequencecache.c @@ -186,7 +186,7 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte } } -static void bloRead(BloReader *reader, ModifierData *md) +static void bloRead(BloReader *UNUSED(reader), ModifierData *md) { MeshSeqCacheModifierData *msmcd = (MeshSeqCacheModifierData *)md; msmcd->reader = NULL; diff --git a/source/blender/modifiers/intern/MOD_ocean.c b/source/blender/modifiers/intern/MOD_ocean.c index 27f5cb4cafe..8c225ff9e4b 100644 --- a/source/blender/modifiers/intern/MOD_ocean.c +++ b/source/blender/modifiers/intern/MOD_ocean.c @@ -41,6 +41,8 @@ #include "DEG_depsgraph_query.h" +#include "BLO_callback_api.h" + #include "MOD_modifiertypes.h" #ifdef WITH_OCEANSIM @@ -179,6 +181,13 @@ static bool dependsOnNormals(ModifierData *md) return (omd->geometry_mode != MOD_OCEAN_GEOM_GENERATE); } +static void bloRead(BloReader *UNUSED(reader), ModifierData *md) +{ + OceanModifierData *omd = (OceanModifierData *)md; + omd->oceancache = NULL; + omd->ocean = NULL; +} + #ifdef WITH_OCEANSIM typedef struct GenerateOceanGeometryData { @@ -519,5 +528,5 @@ ModifierTypeInfo modifierType_Ocean = { /* foreachTexLink */ NULL, /* freeRuntimeData */ NULL, /* bloWrite */ NULL, - /* bloRead */ NULL, + /* bloRead */ bloRead, }; |