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

blender:main

blender:brush-assets-project

blender:fix-121021

blender:blender-v3.3-release

blender:partial-write-refactor

blender:universal-scene-description

blender:blender-v4.1-release

blender:blender-v3.6-release

blender:blender-v3.6-temp_wmoss_animrig_public

blender:temp-sculpt-dyntopo

blender:gpencil-next

blender:anim/animation-id-113594

blender:blender-v4.0-release

blender:blender-projects-basics

blender:bridge-curves

blender:sculpt-blender

blender:asset-browser-frontend-split

blender:asset-shelf

blender:tmp-usd-python-mtl

blender:tmp-usd-3.6

blender:blender-v3.5-release

blender:blender-v2.93-release

blender:realtime-clock

blender:sculpt-dev

blender:bevelv2

blender:xr-dev

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 Commits

Author	SHA1	Message	Date
Philipp Oeser	55b3352ba1	Fix #98583: Appending a particle system pulls in an unused collection ... When setting a `ParticleSettings->instance_collection` but having `ParticleSettings->render_type` something other than `PART_DRAW_GR`, the collection would still be pulled in when appending. Same thing for `ParticleSettings->instance_object` and `PART_DRAW_OB`. This seems unnecessary, and since we do similar - conditional - expansions with `BLO_expand`, this patch now only pulls in the object/ collection when actually used.	2023-02-16 12:08:44 +01:00