blender
/
blender
136
406
Fork 589
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

Cleanup: remove duplicated code from previously unnoticed merge conflict 

`BKE_animdata_blend_expand` is called in `expand_id` already.
This commit is contained in:
Jacques Lucke 2020-08-21 16:01:30 +02:00
parent 0de48f8550
commit 995725c681
1 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/blenloader/intern/readfile.c
View File

@ -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);
}