Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Tönne <lukas.toenne@gmail.com>2014-03-10 15:45:19 +0400
committerLukas Tönne <lukas.toenne@gmail.com>2014-03-10 15:46:01 +0400
commit658f37acd7968d12fc8cac8a8154e680dd57d74f (patch)
treebb4112a9753cff75a6ce2b08f35831b484f8fbf9
parentb977cfd28bd2896e9be7709e8b4b1e4713511ff7 (diff)
Minor cleanup: use rna_ prefix for path_resolve_* functions for
consistency.
-rw-r--r--source/blender/makesrna/intern/rna_access.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/makesrna/intern/rna_access.c b/source/blender/makesrna/intern/rna_access.c
index 7311c462cf7..7138f97bf9a 100644
--- a/source/blender/makesrna/intern/rna_access.c
+++ b/source/blender/makesrna/intern/rna_access.c
@@ -3902,7 +3902,7 @@ bool RNA_path_resolve(PointerRNA *ptr, const char *path, PointerRNA *r_ptr, Prop
return RNA_path_resolve_full(ptr, path, r_ptr, r_prop, NULL);
}
-static bool path_resolve_collection_key(const char **path, PointerRNA *ptr, PropertyRNA *prop, PointerRNA *r_nextptr)
+static bool rna_path_resolve_collection_key(const char **path, PointerRNA *ptr, PropertyRNA *prop, PointerRNA *r_nextptr)
{
char fixedbuf[256], *token;
int intkey;
@@ -3958,7 +3958,7 @@ static bool path_resolve_collection_key(const char **path, PointerRNA *ptr, Prop
return r_nextptr->data != NULL;
}
-static bool path_resolve_array_index(const char **path, PointerRNA *ptr, PropertyRNA *prop, int *r_index)
+static bool rna_path_resolve_array_index(const char **path, PointerRNA *ptr, PropertyRNA *prop, int *r_index)
{
char fixedbuf[256], *token;
int index_arr[RNA_MAX_ARRAY_DIMENSION] = {0};
@@ -4102,7 +4102,7 @@ bool RNA_path_resolve_full(PointerRNA *ptr, const char *path, PointerRNA *r_ptr,
if (index) *index = -1;
break;
case PROP_COLLECTION:
- if (!path_resolve_collection_key(&path, &curptr, prop, &nextptr))
+ if (!rna_path_resolve_collection_key(&path, &curptr, prop, &nextptr))
return false;
curptr = nextptr;
@@ -4111,7 +4111,7 @@ bool RNA_path_resolve_full(PointerRNA *ptr, const char *path, PointerRNA *r_ptr,
break;
default:
if (index) {
- if (!path_resolve_array_index(&path, &curptr, prop, index))
+ if (!rna_path_resolve_array_index(&path, &curptr, prop, index))
return false;
}
break;