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:
authorBastien Montagne <b.mont29@gmail.com>2020-02-10 20:05:19 +0300
committerBastien Montagne <b.mont29@gmail.com>2020-02-10 20:05:19 +0300
commite75e29ee478592742defb80d6d992173f4a635df (patch)
treea43d9b93efe2a8838e45509c25a7c988c1cc8c22 /source/blender/makesrna
parentc6e28f65139d6e7536789d9bf1895e7f7058ac92 (diff)
Cleanup: Rename `BKE_library_override_` functions to `BKE_lib_override_library_`
pqrt of T72604.
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r--source/blender/makesrna/intern/rna_ID.c4
-rw-r--r--source/blender/makesrna/intern/rna_access_compare_override.c16
-rw-r--r--source/blender/makesrna/intern/rna_rna.c42
3 files changed, 31 insertions, 31 deletions
diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c
index 8a216579c80..12fa8150d5f 100644
--- a/source/blender/makesrna/intern/rna_ID.c
+++ b/source/blender/makesrna/intern/rna_ID.c
@@ -494,7 +494,7 @@ static ID *rna_ID_copy(ID *id, Main *bmain)
static ID *rna_ID_override_create(ID *id, Main *bmain, bool remap_local_usages)
{
- if (!BKE_override_library_is_enabled() || !ID_IS_OVERRIDABLE_LIBRARY(id)) {
+ if (!BKE_lib_override_library_is_enabled() || !ID_IS_OVERRIDABLE_LIBRARY(id)) {
return NULL;
}
@@ -502,7 +502,7 @@ static ID *rna_ID_override_create(ID *id, Main *bmain, bool remap_local_usages)
BKE_main_id_tag_all(bmain, LIB_TAG_DOIT, true);
}
- ID *local_id = BKE_override_library_create_from_id(bmain, id, remap_local_usages);
+ ID *local_id = BKE_lib_override_library_create_from_id(bmain, id, remap_local_usages);
if (remap_local_usages) {
BKE_main_id_tag_all(bmain, LIB_TAG_DOIT, false);
diff --git a/source/blender/makesrna/intern/rna_access_compare_override.c b/source/blender/makesrna/intern/rna_access_compare_override.c
index 9b2902b8f96..a28293515b4 100644
--- a/source/blender/makesrna/intern/rna_access_compare_override.c
+++ b/source/blender/makesrna/intern/rna_access_compare_override.c
@@ -109,7 +109,7 @@ bool RNA_property_overridden(PointerRNA *ptr, PropertyRNA *prop)
return false;
}
- return (BKE_override_library_property_find(id->override_library, rna_path) != NULL);
+ return (BKE_lib_override_library_property_find(id->override_library, rna_path) != NULL);
}
bool RNA_property_comparable(PointerRNA *UNUSED(ptr), PropertyRNA *prop)
@@ -691,7 +691,7 @@ bool RNA_struct_override_matches(Main *bmain,
// printf("Override Checking %s\n", rna_path);
- if (ignore_overridden && BKE_override_library_property_find(override, rna_path) != NULL) {
+ if (ignore_overridden && BKE_lib_override_library_property_find(override, rna_path) != NULL) {
RNA_PATH_FREE;
continue;
}
@@ -730,7 +730,7 @@ bool RNA_struct_override_matches(Main *bmain,
if (diff != 0) {
/* XXX TODO: refine this for per-item overriding of arrays... */
- IDOverrideLibraryProperty *op = BKE_override_library_property_find(override, rna_path);
+ IDOverrideLibraryProperty *op = BKE_lib_override_library_property_find(override, rna_path);
IDOverrideLibraryPropertyOperation *opop = op ? op->operations.first : NULL;
if (do_restore && (report_flags & RNA_OVERRIDE_MATCH_RESULT_CREATED) == 0) {
@@ -1059,7 +1059,7 @@ IDOverrideLibraryProperty *RNA_property_override_property_find(PointerRNA *ptr,
char *rna_path = RNA_path_from_ID_to_property(ptr, prop);
if (rna_path) {
- IDOverrideLibraryProperty *op = BKE_override_library_property_find(id->override_library,
+ IDOverrideLibraryProperty *op = BKE_lib_override_library_property_find(id->override_library,
rna_path);
MEM_freeN(rna_path);
return op;
@@ -1079,7 +1079,7 @@ IDOverrideLibraryProperty *RNA_property_override_property_get(PointerRNA *ptr,
char *rna_path = RNA_path_from_ID_to_property(ptr, prop);
if (rna_path) {
- IDOverrideLibraryProperty *op = BKE_override_library_property_get(
+ IDOverrideLibraryProperty *op = BKE_lib_override_library_property_get(
id->override_library, rna_path, r_created);
MEM_freeN(rna_path);
return op;
@@ -1096,7 +1096,7 @@ IDOverrideLibraryPropertyOperation *RNA_property_override_property_operation_fin
return NULL;
}
- return BKE_override_library_property_operation_find(
+ return BKE_lib_override_library_property_operation_find(
op, NULL, NULL, index, index, strict, r_strict);
}
@@ -1115,7 +1115,7 @@ IDOverrideLibraryPropertyOperation *RNA_property_override_property_operation_get
return NULL;
}
- return BKE_override_library_property_operation_get(
+ return BKE_lib_override_library_property_operation_get(
op, operation, NULL, NULL, index, index, strict, r_strict, r_created);
}
@@ -1125,7 +1125,7 @@ eRNAOverrideStatus RNA_property_override_library_status(PointerRNA *ptr,
{
int override_status = 0;
- if (!BKE_override_library_is_enabled()) {
+ if (!BKE_lib_override_library_is_enabled()) {
return override_status;
}
diff --git a/source/blender/makesrna/intern/rna_rna.c b/source/blender/makesrna/intern/rna_rna.c
index 34ea9d3d03e..b4c4dd1df32 100644
--- a/source/blender/makesrna/intern/rna_rna.c
+++ b/source/blender/makesrna/intern/rna_rna.c
@@ -1290,13 +1290,13 @@ static int rna_property_override_diff_propptr(Main *bmain,
if (do_create && comp != 0) {
bool created = false;
- IDOverrideLibraryProperty *op = BKE_override_library_property_get(
+ IDOverrideLibraryProperty *op = BKE_lib_override_library_property_get(
override, rna_path, &created);
/* If not yet overridden, or if we are handling sub-items (inside a collection)... */
if (op != NULL && (created || rna_itemname_a != NULL || rna_itemname_b != NULL ||
rna_itemindex_a != -1 || rna_itemindex_b != -1)) {
- BKE_override_library_property_operation_get(op,
+ BKE_lib_override_library_property_operation_get(op,
IDOVERRIDE_LIBRARY_OP_REPLACE,
rna_itemname_b,
rna_itemname_a,
@@ -1421,11 +1421,11 @@ int rna_property_override_diff_default(Main *bmain,
if (do_create && comp != 0) {
/* XXX TODO this will have to be refined to handle array items */
bool created = false;
- IDOverrideLibraryProperty *op = BKE_override_library_property_get(
+ IDOverrideLibraryProperty *op = BKE_lib_override_library_property_get(
override, rna_path, &created);
if (op != NULL && created) {
- BKE_override_library_property_operation_get(
+ BKE_lib_override_library_property_operation_get(
op, IDOVERRIDE_LIBRARY_OP_REPLACE, NULL, NULL, -1, -1, true, NULL, NULL);
if (r_override_changed) {
*r_override_changed = created;
@@ -1452,11 +1452,11 @@ int rna_property_override_diff_default(Main *bmain,
if (do_create && comp != 0) {
bool created = false;
- IDOverrideLibraryProperty *op = BKE_override_library_property_get(
+ IDOverrideLibraryProperty *op = BKE_lib_override_library_property_get(
override, rna_path, &created);
if (op != NULL && created) { /* If not yet overridden... */
- BKE_override_library_property_operation_get(
+ BKE_lib_override_library_property_operation_get(
op, IDOVERRIDE_LIBRARY_OP_REPLACE, NULL, NULL, -1, -1, true, NULL, NULL);
if (r_override_changed) {
*r_override_changed = created;
@@ -1486,11 +1486,11 @@ int rna_property_override_diff_default(Main *bmain,
if (do_create && comp != 0) {
/* XXX TODO this will have to be refined to handle array items */
bool created = false;
- IDOverrideLibraryProperty *op = BKE_override_library_property_get(
+ IDOverrideLibraryProperty *op = BKE_lib_override_library_property_get(
override, rna_path, &created);
if (op != NULL && created) {
- BKE_override_library_property_operation_get(
+ BKE_lib_override_library_property_operation_get(
op, IDOVERRIDE_LIBRARY_OP_REPLACE, NULL, NULL, -1, -1, true, NULL, NULL);
if (r_override_changed) {
*r_override_changed = created;
@@ -1517,11 +1517,11 @@ int rna_property_override_diff_default(Main *bmain,
if (do_create && comp != 0) {
bool created = false;
- IDOverrideLibraryProperty *op = BKE_override_library_property_get(
+ IDOverrideLibraryProperty *op = BKE_lib_override_library_property_get(
override, rna_path, &created);
if (op != NULL && created) { /* If not yet overridden... */
- BKE_override_library_property_operation_get(
+ BKE_lib_override_library_property_operation_get(
op, IDOVERRIDE_LIBRARY_OP_REPLACE, NULL, NULL, -1, -1, true, NULL, NULL);
if (r_override_changed) {
*r_override_changed = created;
@@ -1551,11 +1551,11 @@ int rna_property_override_diff_default(Main *bmain,
if (do_create && comp != 0) {
/* XXX TODO this will have to be refined to handle array items */
bool created = false;
- IDOverrideLibraryProperty *op = BKE_override_library_property_get(
+ IDOverrideLibraryProperty *op = BKE_lib_override_library_property_get(
override, rna_path, &created);
if (op != NULL && created) {
- BKE_override_library_property_operation_get(
+ BKE_lib_override_library_property_operation_get(
op, IDOVERRIDE_LIBRARY_OP_REPLACE, NULL, NULL, -1, -1, true, NULL, NULL);
if (r_override_changed) {
*r_override_changed = created;
@@ -1582,11 +1582,11 @@ int rna_property_override_diff_default(Main *bmain,
if (do_create && comp != 0) {
bool created = false;
- IDOverrideLibraryProperty *op = BKE_override_library_property_get(
+ IDOverrideLibraryProperty *op = BKE_lib_override_library_property_get(
override, rna_path, &created);
if (op != NULL && created) { /* If not yet overridden... */
- BKE_override_library_property_operation_get(
+ BKE_lib_override_library_property_operation_get(
op, IDOVERRIDE_LIBRARY_OP_REPLACE, NULL, NULL, -1, -1, true, NULL, NULL);
if (r_override_changed) {
*r_override_changed = created;
@@ -1605,11 +1605,11 @@ int rna_property_override_diff_default(Main *bmain,
if (do_create && comp != 0) {
bool created = false;
- IDOverrideLibraryProperty *op = BKE_override_library_property_get(
+ IDOverrideLibraryProperty *op = BKE_lib_override_library_property_get(
override, rna_path, &created);
if (op != NULL && created) { /* If not yet overridden... */
- BKE_override_library_property_operation_get(
+ BKE_lib_override_library_property_operation_get(
op, IDOVERRIDE_LIBRARY_OP_REPLACE, NULL, NULL, -1, -1, true, NULL, NULL);
if (r_override_changed) {
*r_override_changed = created;
@@ -1639,11 +1639,11 @@ int rna_property_override_diff_default(Main *bmain,
if (do_create && comp != 0) {
bool created = false;
- IDOverrideLibraryProperty *op = BKE_override_library_property_get(
+ IDOverrideLibraryProperty *op = BKE_lib_override_library_property_get(
override, rna_path, &created);
if (op != NULL && created) { /* If not yet overridden... */
- BKE_override_library_property_operation_get(
+ BKE_lib_override_library_property_operation_get(
op, IDOVERRIDE_LIBRARY_OP_REPLACE, NULL, NULL, -1, -1, true, NULL, NULL);
if (r_override_changed) {
*r_override_changed = created;
@@ -1794,7 +1794,7 @@ int rna_property_override_diff_default(Main *bmain,
* also assume then that _a data is the one where things are inserted. */
if (is_valid_for_insertion && use_insertion) {
bool created;
- IDOverrideLibraryProperty *op = BKE_override_library_property_get(
+ IDOverrideLibraryProperty *op = BKE_lib_override_library_property_get(
override, rna_path, &created);
if (is_first_insert) {
@@ -1806,14 +1806,14 @@ int rna_property_override_diff_default(Main *bmain,
if (ELEM(opop->operation,
IDOVERRIDE_LIBRARY_OP_INSERT_AFTER,
IDOVERRIDE_LIBRARY_OP_INSERT_BEFORE)) {
- BKE_override_library_property_operation_delete(op, opop);
+ BKE_lib_override_library_property_operation_delete(op, opop);
}
opop = opop_next;
}
is_first_insert = false;
}
- BKE_override_library_property_operation_get(op,
+ BKE_lib_override_library_property_operation_get(op,
IDOVERRIDE_LIBRARY_OP_INSERT_AFTER,
NULL,
prev_propname_a,