Merge branch 'blender-v3.5-release'
This commit is contained in:
@@ -746,7 +746,13 @@ bool BPy_IDProperty_Map_ValidateAndCreate(PyObject *name_obj, IDProperty *group,
|
|||||||
MEM_freeN(prop);
|
MEM_freeN(prop);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
const bool overridable = prop_exist ?
|
||||||
|
(prop_exist->flag & IDP_FLAG_OVERRIDABLE_LIBRARY) != 0 :
|
||||||
|
false;
|
||||||
IDP_ReplaceInGroup_ex(group, prop, prop_exist);
|
IDP_ReplaceInGroup_ex(group, prop, prop_exist);
|
||||||
|
if (overridable) {
|
||||||
|
prop->flag |= IDP_FLAG_OVERRIDABLE_LIBRARY;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user