blender
/
blender
136
406
Fork 588
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

Fix T84516: ID properties have incorrect names in Python dir() list 

Caused by not going through the proper accessor function to access the
property identifier.
This commit is contained in:
Brecht Van Lommel 2021-01-11 15:46:31 +01:00
parent 98268e5c68
commit 9e1ec5033d
Notes: blender-bot 2023-02-14 11:21:40 +01:00 
Referenced by issue #84647, Crash: Python/Undo related crash in BKE_scene_object_base_flag_sync_from_base
Referenced by issue #84516, PoseBone lists inaccessible object variables when it has custom properties
1 changed files with 17 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
source/blender/makesrna/intern/rna_rna.c
View File

@ -482,9 +482,7 @@ static StructRNA *rna_Property_refine(PointerRNA *ptr)
{
PropertyRNA *prop = (PropertyRNA *)ptr->data;
prop = rna_ensure_property(prop);
switch (prop->type) {
switch (RNA_property_type(prop)) {
case PROP_BOOLEAN:
return &RNA_BoolProperty;
case PROP_INT:
@ -507,70 +505,64 @@ static StructRNA *rna_Property_refine(PointerRNA *ptr)
static void rna_Property_identifier_get(PointerRNA *ptr, char *value)
{
PropertyRNA *prop = (PropertyRNA *)ptr->data;
prop = rna_ensure_property(prop);
strcpy(value, ((PropertyRNA *)prop)->identifier);
strcpy(value, RNA_property_identifier(prop));
}
static int rna_Property_identifier_length(PointerRNA *ptr)
{
PropertyRNA *prop = (PropertyRNA *)ptr->data;
prop = rna_ensure_property(prop);
return strlen(prop->identifier);
return strlen(RNA_property_identifier(prop));
}
static void rna_Property_name_get(PointerRNA *ptr, char *value)
{
PropertyRNA *prop = (PropertyRNA *)ptr->data;
prop = rna_ensure_property(prop);
strcpy(value, prop->name ? prop->name : "");
const char *name = RNA_property_ui_name_raw(prop);
strcpy(value, name ? name : "");
}
static int rna_Property_name_length(PointerRNA *ptr)
{
PropertyRNA *prop = (PropertyRNA *)ptr->data;
prop = rna_ensure_property(prop);
return prop->name ? strlen(prop->name) : 0;
const char *name = RNA_property_ui_name_raw(prop);
return name ? strlen(name) : 0;
}
static void rna_Property_description_get(PointerRNA *ptr, char *value)
{
PropertyRNA *prop = (PropertyRNA *)ptr->data;
prop = rna_ensure_property(prop);
strcpy(value, prop->description ? prop->description : "");
const char *description = RNA_property_ui_description_raw(prop);
strcpy(value, description ? description : "");
}
static int rna_Property_description_length(PointerRNA *ptr)
{
PropertyRNA *prop = (PropertyRNA *)ptr->data;
prop = rna_ensure_property(prop);
return prop->description ? strlen(prop->description) : 0;
const char *description = RNA_property_ui_description_raw(prop);
return description ? strlen(description) : 0;
}
static void rna_Property_translation_context_get(PointerRNA *ptr, char *value)
{
PropertyRNA *prop = (PropertyRNA *)ptr->data;
prop = rna_ensure_property(prop);
strcpy(value, prop->translation_context);
strcpy(value, RNA_property_translation_context(prop));
}
static int rna_Property_translation_context_length(PointerRNA *ptr)
{
PropertyRNA *prop = (PropertyRNA *)ptr->data;
prop = rna_ensure_property(prop);
return strlen(prop->translation_context);
return strlen(RNA_property_translation_context(prop));
}
static int rna_Property_type_get(PointerRNA *ptr)
{
PropertyRNA *prop = (PropertyRNA *)ptr->data;
prop = rna_ensure_property(prop);
return prop->type;
return RNA_property_type(prop);
}
static int rna_Property_subtype_get(PointerRNA *ptr)
{
PropertyRNA *prop = (PropertyRNA *)ptr->data;
prop = rna_ensure_property(prop);
return prop->subtype;
return RNA_property_subtype(prop);
}
static PointerRNA rna_Property_srna_get(PointerRNA *ptr)
@ -583,15 +575,13 @@ static PointerRNA rna_Property_srna_get(PointerRNA *ptr)
static int rna_Property_unit_get(PointerRNA *ptr)
{
PropertyRNA *prop = (PropertyRNA *)ptr->data;
prop = rna_ensure_property(prop);
return RNA_SUBTYPE_UNIT(prop->subtype);
return RNA_property_unit(prop);
}
static int rna_Property_icon_get(PointerRNA *ptr)
{
PropertyRNA *prop = (PropertyRNA *)ptr->data;
prop = rna_ensure_property(prop);
return prop->icon;
return RNA_property_ui_icon(prop);
}
static bool rna_Property_readonly_get(PointerRNA *ptr)