diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2015-05-08 11:48:53 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-05-08 11:48:53 +0300 |
| commit | 0335a0507ce2e0e8dae941ebb7593f5175b54175 (patch) | |
| tree | d4233e73476fc3ecbdda7eb0655e3ba74bd9ec29 /source/blender/blenloader/intern | |
| parent | b120755c2128d6ec46ab8cd3a0ff520749b5fd21 (diff) | |
| parent | 158568e347ee88aaf260cdb97e37395182b274e5 (diff) | |
Merge branch 'alembic' into gooseberry
Conflicts:
source/blender/physics/intern/BPH_mass_spring.cpp
Diffstat (limited to 'source/blender/blenloader/intern')
| -rw-r--r-- | source/blender/blenloader/intern/readfile.c | 3 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/writefile.c | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 6342a800abd..d33112dd596 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -2053,6 +2053,9 @@ static void direct_link_cache_modifiers(FileData *fd, ListBase *modifiers) hsmd->sim_params.goal_stiffness_mapping = newdataadr(fd, hsmd->sim_params.goal_stiffness_mapping); if (hsmd->sim_params.goal_stiffness_mapping) direct_link_curvemapping(fd, hsmd->sim_params.goal_stiffness_mapping); + hsmd->sim_params.bend_stiffness_mapping = newdataadr(fd, hsmd->sim_params.bend_stiffness_mapping); + if (hsmd->sim_params.bend_stiffness_mapping) + direct_link_curvemapping(fd, hsmd->sim_params.bend_stiffness_mapping); break; } case eCacheModifierType_StrandsKey: { diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index 2254c03bfd8..cc0c2cfb4be 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -3566,6 +3566,8 @@ static void write_cache_modifiers(WriteData *wd, CacheLibrary *cachelib) writestruct(wd, DATA, "EffectorWeights", 1, hsmd->sim_params.effector_weights); if (hsmd->sim_params.goal_stiffness_mapping) write_curvemapping(wd, hsmd->sim_params.goal_stiffness_mapping); + if (hsmd->sim_params.bend_stiffness_mapping) + write_curvemapping(wd, hsmd->sim_params.bend_stiffness_mapping); break; } } |