diff options
author | Jacques Lucke <jacques@blender.org> | 2020-08-21 17:01:30 +0300 |
---|---|---|
committer | Jacques Lucke <jacques@blender.org> | 2020-08-21 17:01:30 +0300 |
commit | 995725c681aba276df901d6b92c03247364e0764 (patch) | |
tree | a6e626bfc4c97bc9e3ca6e47b42225251ecfa783 /source/blender/blenloader/intern/readfile.c | |
parent | 0de48f8550ad599f43bcc2773cc60a32bebbf5d5 (diff) |
Cleanup: remove duplicated code from previously unnoticed merge conflict
`BKE_animdata_blend_expand` is called in `expand_id` already.
Diffstat (limited to 'source/blender/blenloader/intern/readfile.c')
-rw-r--r-- | source/blender/blenloader/intern/readfile.c | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index efe5d5ef0db..fab2e7df06b 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -10315,10 +10315,6 @@ static void expand_hair(BlendExpander *expander, Hair *hair) for (int a = 0; a < hair->totcol; a++) { BLO_expand(expander, hair->mat[a]); } - - if (hair->adt) { - BKE_animdata_blend_expand(expander, hair->adt); - } } static void expand_pointcloud(BlendExpander *expander, PointCloud *pointcloud) @@ -10326,10 +10322,6 @@ static void expand_pointcloud(BlendExpander *expander, PointCloud *pointcloud) for (int a = 0; a < pointcloud->totcol; a++) { BLO_expand(expander, pointcloud->mat[a]); } - - if (pointcloud->adt) { - BKE_animdata_blend_expand(expander, pointcloud->adt); - } } static void expand_volume(BlendExpander *expander, Volume *volume) @@ -10337,17 +10329,10 @@ static void expand_volume(BlendExpander *expander, Volume *volume) for (int a = 0; a < volume->totcol; a++) { BLO_expand(expander, volume->mat[a]); } - - if (volume->adt) { - BKE_animdata_blend_expand(expander, volume->adt); - } } static void expand_simulation(BlendExpander *expander, Simulation *simulation) { - if (simulation->adt) { - BKE_animdata_blend_expand(expander, simulation->adt); - } LISTBASE_FOREACH (SimulationDependency *, dependency, &simulation->dependencies) { BLO_expand(expander, dependency->id); } |