[Bf-blender-cvs] [d912bb9cce4] blenloader-api: update mesh sequence cache modifier

Jacques Lucke noreply at git.blender.org
Sat Mar 7 19:09:29 CET 2020


Commit: d912bb9cce426874fe14af8fa63e2721d535a6a2
Author: Jacques Lucke
Date:   Sat Mar 7 18:58:28 2020 +0100
Branches: blenloader-api
https://developer.blender.org/rBd912bb9cce426874fe14af8fa63e2721d535a6a2

update mesh sequence cache modifier

===================================================================

M	source/blender/blenloader/intern/readfile.c
M	source/blender/modifiers/intern/MOD_meshsequencecache.c

===================================================================

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index f7af2fea719..5ebee83547a 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -5425,11 +5425,6 @@ static void direct_link_modifiers(FileData *fd, ListBase *lb, Object *ob)
       omd->oceancache = NULL;
       omd->ocean = NULL;
     }
-    else if (md->type == eModifierType_MeshSequenceCache) {
-      MeshSeqCacheModifierData *msmcd = (MeshSeqCacheModifierData *)md;
-      msmcd->reader = NULL;
-      msmcd->reader_object_path[0] = '\0';
-    }
   }
 }
 
diff --git a/source/blender/modifiers/intern/MOD_meshsequencecache.c b/source/blender/modifiers/intern/MOD_meshsequencecache.c
index 4022b997e39..9cfee8de99b 100644
--- a/source/blender/modifiers/intern/MOD_meshsequencecache.c
+++ b/source/blender/modifiers/intern/MOD_meshsequencecache.c
@@ -37,6 +37,8 @@
 #include "DEG_depsgraph_build.h"
 #include "DEG_depsgraph_query.h"
 
+#include "BLO_callback_api.h"
+
 #include "MOD_modifiertypes.h"
 
 #ifdef WITH_ALEMBIC
@@ -184,6 +186,13 @@ static void updateDepsgraph(ModifierData *md, const ModifierUpdateDepsgraphConte
   }
 }
 
+static void bloRead(BloReader *reader, ModifierData *md)
+{
+  MeshSeqCacheModifierData *msmcd = (MeshSeqCacheModifierData *)md;
+  msmcd->reader = NULL;
+  msmcd->reader_object_path[0] = '\0';
+}
+
 ModifierTypeInfo modifierType_MeshSequenceCache = {
     /* name */ "Mesh Sequence Cache",
     /* structName */ "MeshSeqCacheModifierData",
@@ -211,5 +220,5 @@ ModifierTypeInfo modifierType_MeshSequenceCache = {
     /* foreachTexLink */ NULL,
     /* freeRuntimeData */ NULL,
     /* bloWrite */ NULL,
-    /* bloRead */ NULL,
+    /* bloRead */ bloRead,
 };



More information about the Bf-blender-cvs mailing list