blender
/
blender
134
399
Fork 581
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

Fix #98583: Appending a particle system pulls in an unused collection #104814

Closed
Philipp Oeser wants to merge 1 commits from lichtwerk/blender:98583 into blender-v3.5-release
pull from: lichtwerk/blender:98583
merge into: blender:blender-v3.5-release

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 3 Commits 1 Files Changed 1 +6 -2
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/blenkernel/intern/particle.cc
View File

@ -436,8 +436,12 @@ static void particle_settings_blend_read_lib(BlendLibReader *reader, ID *id)
static void particle_settings_blend_read_expand(BlendExpander *expander, ID *id)
{
ParticleSettings *part = (ParticleSettings *)id;
BLO_expand(expander, part->instance_object);
BLO_expand(expander, part->instance_collection);
if (part->ren_as == PART_DRAW_OB) {
BLO_expand(expander, part->instance_object);
}
else if (part->ren_as == PART_DRAW_GR) {
BLO_expand(expander, part->instance_collection);
}
BLO_expand(expander, part->force_group);
BLO_expand(expander, part->bb_ob);
BLO_expand(expander, part->collision_group);