Commit: c303f2a19b9ebea43c68b72d45092f6219900538
Author: Dalai Felinto
Date: Tue Jun 12 14:26:43 2018 +0200
Branches: temp-dynamic-overrides
https://developer.blender.org/rBc303f2a19b9ebea43c68b72d45092f6219900538
Use proper UI name
===================================================================
M source/blender/makesrna/intern/rna_dynamic_override.c
===================================================================
diff --git a/source/blender/makesrna/intern/rna_dynamic_override.c
b/source/blender/makesrna/intern/rna_dynamic_override.c
index 5168243af5d..e6c5035718a 100644
--- a/source/blender/makesrna/intern/rna_dynamic_override.c
+++ b/source/blender/makesrna/intern/rna_dynamic_override.c
@@ -53,20 +53,6 @@ const EnumPropertyItem
rna_enum_dynamic_override_property_type_items[] = {
#include "DEG_depsgraph.h"
-static void rna_DynamicOverrideProperty_name_get(PointerRNA *ptr, char *value)
-{
- DynamicOverrideProperty *dyn_prop = ptr->data;
- /* TODO: Get the name from data_path. */
- strcpy(value, dyn_prop->rna_path);
-}
-
-static int rna_DynamicOverrideProperty_length(PointerRNA *ptr)
-{
- DynamicOverrideProperty *dyn_prop = ptr->data;
- /* TODO: Get the name from data_path. */
- return strlen(dyn_prop->rna_path);
-}
-
static PropertyRNA *rna_DynamicOverride_property_get(PointerRNA *ptr)
{
DynamicOverrideProperty *dyn_prop = ptr->data;
@@ -95,6 +81,30 @@ static PropertyRNA
*rna_DynamicOverride_property_get(PointerRNA *ptr)
}
+static void rna_DynamicOverrideProperty_name_get(PointerRNA *ptr, char *value)
+{
+ PropertyRNA *prop = rna_DynamicOverride_property_get(ptr);
+ if (prop == NULL) {
+ DynamicOverrideProperty *dyn_prop = ptr->data;
+ strcpy(value, dyn_prop->rna_path);
+ }
+
+ const char *name = RNA_property_ui_name(prop);
+ strcpy(value, name);
+}
+
+static int rna_DynamicOverrideProperty_length(PointerRNA *ptr)
+{
+ PropertyRNA *prop = rna_DynamicOverride_property_get(ptr);
+ if (prop == NULL) {
+ DynamicOverrideProperty *dyn_prop = ptr->data;
+ return strlen(dyn_prop->rna_path);
+ }
+
+ const char *name = RNA_property_ui_name(prop);
+ return strlen(name);
+}
+
static int rna_DynamicOverrideProperty_data_type_get(PointerRNA *ptr)
{
PropertyRNA *prop = rna_DynamicOverride_property_get(ptr);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
