griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix: duplicate modifier uids with overrides

Browse Source 
Keep the `persistent_uid` that is already known to be unique on `ob_dst`
instead of copying the one from `md_src` which may not be unique in
`ob_dst`.

Pull Request: https://projects.blender.org/blender/blender/pulls/117942
This commit is contained in:
Jacques Lucke
2024-02-07 14:21:38 +01:00
parent 78963b466b
commit fc8333089c
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/makesrna/intern/rna_object.cc
View File

@@ -1865,7 +1865,9 @@ bool rna_Object_modifiers_override_apply(Main *bmain,
ParticleSystem *psys_dst = (mod_dst->type == eModifierType_ParticleSystem) ?
(reinterpret_cast<ParticleSystemModifierData *>(mod_dst))->psys :
nullptr;
const int persistent_uid = mod_dst->persistent_uid;
BKE_modifier_copydata(mod_src, mod_dst);
mod_dst->persistent_uid = persistent_uid;
if (mod_dst->type == eModifierType_ParticleSystem) {
psys_dst->flag &= ~PSYS_DELETE;
(reinterpret_cast<ParticleSystemModifierData *>(mod_dst))->psys = psys_dst;