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:
authorLukas Tönne <lukas.toenne@gmail.com>2015-05-11 12:41:40 +0300
committerLukas Tönne <lukas.toenne@gmail.com>2015-05-11 12:41:40 +0300
commit09ad591e1f0f02955238fba085d42e370ae1cff8 (patch)
tree9c0e7ac458e6daa65ab0d77dab7770fd53753324 /source/blender/blenloader/intern
parent28d4538215fc9fe28298b062dfa078d334bc4d88 (diff)
parenta5392ad4aa4ed97e3754d63452120e132f2224ac (diff)
Merge branch 'alembic' into gooseberry
Diffstat (limited to 'source/blender/blenloader/intern')
-rw-r--r--source/blender/blenloader/intern/readfile.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index d33112dd596..b5f51edaa5a 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -2058,6 +2058,11 @@ static void direct_link_cache_modifiers(FileData *fd, ListBase *modifiers)
direct_link_curvemapping(fd, hsmd->sim_params.bend_stiffness_mapping);
break;
}
+ case eCacheModifierType_ForceField: {
+ ForceFieldCacheModifier *ffmd = (ForceFieldCacheModifier *)md;
+ ffmd->vertex_cache = NULL;
+ break;
+ }
case eCacheModifierType_StrandsKey: {
StrandsKeyCacheModifier *skmd = (StrandsKeyCacheModifier *)md;
skmd->edit = NULL;