archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix RNA's "editable" func regarding IDProps and override.

Browse Source 
`RNA_property_overridable_get()` need the original RNA property (i.e.
the actual IDProp in case it is one), not the 'proxy' type property
returned by `rna_ensure_property()` for IDProps.

Makes custom properties of library overrides editable at last, now we
only have to keep them overridden values!
This commit is contained in:
Bastien Montagne
2019-09-30 10:57:48 +02:00
parent 64c8e9a219
commit 56854bd177
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/makesrna/intern/rna_access.c
View File

@@ -2058,18 +2058,18 @@ int RNA_property_ui_icon(PropertyRNA *prop)
return rna_ensure_property(prop)->icon;
}
bool RNA_property_editable(PointerRNA *ptr, PropertyRNA *prop)
bool RNA_property_editable(PointerRNA *ptr, PropertyRNA *prop_orig)
{
ID *id = ptr->owner_id;
int flag;
const char *dummy_info;
prop = rna_ensure_property(prop);
PropertyRNA *prop = rna_ensure_property(prop_orig);
flag = prop->editable ? prop->editable(ptr, &dummy_info) : prop->flag;
return ((flag & PROP_EDITABLE) && (flag & PROP_REGISTER) == 0 &&
(!id || ((!ID_IS_LINKED(id) || (prop->flag & PROP_LIB_EXCEPTION)) &&
(!id->override_library || RNA_property_overridable_get(ptr, prop)))));
(!id->override_library || RNA_property_overridable_get(ptr, prop_orig)))));
}
/**