[Bf-blender-cvs] [15937c1f8e1] id_override_static: Rename RNA_property_override_..._get() functions to ..._find()
Bastien Montagne
noreply at git.blender.org
Wed Apr 5 21:54:35 CEST 2017
Commit: 15937c1f8e194626efdf6ac9037349df4bc12952
Author: Bastien Montagne
Date: Wed Apr 5 17:15:28 2017 +0200
Branches: id_override_static
https://developer.blender.org/rB15937c1f8e194626efdf6ac9037349df4bc12952
Rename RNA_property_override_..._get() functions to ..._find()
Matches functions defined in BKE_library_override!
===================================================================
M source/blender/editors/interface/interface_ops.c
M source/blender/makesrna/RNA_access.h
M source/blender/makesrna/intern/rna_access.c
===================================================================
diff --git a/source/blender/editors/interface/interface_ops.c b/source/blender/editors/interface/interface_ops.c
index a1e34e407b3..cbb7d6d0e8f 100644
--- a/source/blender/editors/interface/interface_ops.c
+++ b/source/blender/editors/interface/interface_ops.c
@@ -430,7 +430,7 @@ static int override_remove_button_exec(bContext *C, wmOperator *op)
UI_context_active_but_prop_get(C, &ptr, &prop, &index);
ID *id = ptr.id.data;
- IDOverrideProperty *oprop = RNA_property_override_property_get(&ptr, prop);
+ IDOverrideProperty *oprop = RNA_property_override_property_find(&ptr, prop);
BLI_assert(oprop != NULL);
BLI_assert(id != NULL && id->override != NULL);
diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h
index 5f9267b3e2c..22a70b1929b 100644
--- a/source/blender/makesrna/RNA_access.h
+++ b/source/blender/makesrna/RNA_access.h
@@ -1237,8 +1237,8 @@ void RNA_struct_override_apply(
bool RNA_struct_auto_override(
struct PointerRNA *local, struct PointerRNA *reference, struct IDOverride *override, const char *root_path);
-struct IDOverrideProperty *RNA_property_override_property_get(PointerRNA *ptr, PropertyRNA *prop);
-struct IDOverridePropertyOperation *RNA_property_override_property_operation_get(
+struct IDOverrideProperty *RNA_property_override_property_find(PointerRNA *ptr, PropertyRNA *prop);
+struct IDOverridePropertyOperation *RNA_property_override_property_operation_find(
PointerRNA *ptr, PropertyRNA *prop, const int index);
bool RNA_property_overridable(PointerRNA *ptr, PropertyRNA *prop);
diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c
index 8a7b10d278e..b802f76d608 100644
--- a/source/blender/makesrna/intern/rna_access.c
+++ b/source/blender/makesrna/intern/rna_access.c
@@ -8052,7 +8052,7 @@ bool RNA_struct_auto_override(PointerRNA *local, PointerRNA *reference, IDOverri
return changed;
}
-IDOverrideProperty *RNA_property_override_property_get(PointerRNA *ptr, PropertyRNA *prop)
+IDOverrideProperty *RNA_property_override_property_find(PointerRNA *ptr, PropertyRNA *prop)
{
ID *id = ptr->id.data;
@@ -8073,10 +8073,10 @@ IDOverrideProperty *RNA_property_override_property_get(PointerRNA *ptr, Property
return NULL;
}
-IDOverridePropertyOperation *RNA_property_override_property_operation_get(
+IDOverridePropertyOperation *RNA_property_override_property_operation_find(
PointerRNA *ptr, PropertyRNA *prop, const int index)
{
- IDOverrideProperty *op = RNA_property_override_property_get(ptr, prop);
+ IDOverrideProperty *op = RNA_property_override_property_find(ptr, prop);
if (!op) {
return NULL;
@@ -8116,7 +8116,7 @@ bool RNA_property_overridden(PointerRNA *ptr, PropertyRNA *prop, const int index
return false;
}
- if (RNA_property_override_property_operation_get(ptr, prop, index)) {
+ if (RNA_property_override_property_operation_find(ptr, prop, index)) {
return true;
}
More information about the Bf-blender-cvs
mailing list