blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Fix T98283: Regression: crash when opening file that has Collision modifier on liboverride object 

Some RNA property update callbacks can already generate such modifier,
and only one is allowed per object, so had to adapt code actually adding
new modifiers in liboverride apply codebase.
This commit is contained in:
Bastien Montagne 2022-05-23 12:11:09 +02:00
parent a5409d2b59
commit 62a2b92b6b
Notes: blender-bot 2023-02-14 08:49:53 +01:00 
Referenced by issue #98283, Regression: crash when opening file that has (physics) modifier on library override object
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/makesrna/intern/rna_object.c
View File

@ -1829,6 +1829,24 @@ bool rna_Object_modifiers_override_apply(Main *bmain,
ModifierData *mod_dst = ED_object_modifier_add(
NULL, bmain, NULL, ob_dst, mod_src->name, mod_src->type);
if (mod_dst == NULL) {
/* This can happen e.g. when a modifier type is tagged as `eModifierTypeFlag_Single`, and that
* modifier has somehow been added already by another code path (e.g.
* `rna_CollisionSettings_dependency_update` does add the `eModifierType_Collision` singleton
* modifier).
*
* Try to handle this by finding already existing one here. */
const ModifierTypeInfo *mti = BKE_modifier_get_info((ModifierType)mod_src->type);
if (mti->flags & eModifierTypeFlag_Single) {
mod_dst = BKE_modifiers_findby_type(ob_dst, (ModifierType)mod_src->type);
}
if (mod_dst == NULL) {
BLI_assert(mod_src != NULL);
return false;
}
}
/* XXX Current handling of 'copy' from particle-system modifier is *very* bad (it keeps same psys
* pointer as source, then calling code copies psys of object separately and do some magic
* remapping of pointers...), unfortunately several pieces of code in Object editing area rely on