[Bf-blender-cvs] [88ed3e37de3] id_override_static: Rename 'override' to 'override_static' (and similar).
Bastien Montagne
noreply at git.blender.org
Wed Nov 29 12:45:57 CET 2017
Commit: 88ed3e37de3ba06a232f6ed7770cf81beb687ef0
Author: Bastien Montagne
Date: Wed Nov 29 12:40:18 2017 +0100
Branches: id_override_static
https://developer.blender.org/rB88ed3e37de3ba06a232f6ed7770cf81beb687ef0
Rename 'override' to 'override_static' (and similar).
Initially there was hope at least part of this work could be used for
dynamic overrides as well... but looks like not, so better be specific
and avoid any confusion.
PS: this commit break any file saved with static overrides, should not
be an issue though.
===================================================================
M source/blender/blenkernel/BKE_library_override.h
M source/blender/blenkernel/intern/library_override.c
M source/blender/blenkernel/intern/library_query.c
M source/blender/blenkernel/intern/library_remap.c
M source/blender/blenloader/intern/readfile.c
M source/blender/blenloader/intern/writefile.c
M source/blender/editors/interface/interface_ops.c
M source/blender/editors/object/object_relations.c
M source/blender/editors/util/undo.c
M source/blender/makesdna/DNA_ID.h
M source/blender/makesrna/RNA_access.h
M source/blender/makesrna/intern/rna_ID.c
M source/blender/makesrna/intern/rna_access.c
M source/blender/makesrna/intern/rna_animation.c
M source/blender/makesrna/intern/rna_internal.h
M source/blender/makesrna/intern/rna_internal_types.h
M source/blender/makesrna/intern/rna_rna.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_library_override.h b/source/blender/blenkernel/BKE_library_override.h
index 7deb7e2e862..1ba009660f2 100644
--- a/source/blender/blenkernel/BKE_library_override.h
+++ b/source/blender/blenkernel/BKE_library_override.h
@@ -33,53 +33,53 @@
*/
struct ID;
-struct IDOverride;
-struct IDOverrideProperty;
-struct IDOverridePropertyOperation;
+struct IDOverrideStatic;
+struct IDOverrideStaticProperty;
+struct IDOverrideStaticPropertyOperation;
struct Main;
-struct IDOverride *BKE_override_init(struct ID *local_id, struct ID *reference_id);
-void BKE_override_copy(struct ID *dst_id, const struct ID *src_id);
-void BKE_override_clear(struct IDOverride *override);
-void BKE_override_free(struct IDOverride **override);
+struct IDOverrideStatic *BKE_override_static_init(struct ID *local_id, struct ID *reference_id);
+void BKE_override_static_copy(struct ID *dst_id, const struct ID *src_id);
+void BKE_override_static_clear(struct IDOverrideStatic *override);
+void BKE_override_static_free(struct IDOverrideStatic **override);
-struct ID *BKE_override_create_from(struct Main *bmain, struct ID *reference_id);
+struct ID *BKE_override_static_create_from(struct Main *bmain, struct ID *reference_id);
-struct IDOverrideProperty *BKE_override_property_find(struct IDOverride *override, const char *rna_path);
-struct IDOverrideProperty *BKE_override_property_get(struct IDOverride *override, const char *rna_path, bool *r_created);
-void BKE_override_property_delete(struct IDOverride *override, struct IDOverrideProperty *override_property);
+struct IDOverrideStaticProperty *BKE_override_static_property_find(struct IDOverrideStatic *override, const char *rna_path);
+struct IDOverrideStaticProperty *BKE_override_static_property_get(struct IDOverrideStatic *override, const char *rna_path, bool *r_created);
+void BKE_override_static_property_delete(struct IDOverrideStatic *override, struct IDOverrideStaticProperty *override_property);
-struct IDOverridePropertyOperation *BKE_override_property_operation_find(
- struct IDOverrideProperty *override_property,
+struct IDOverrideStaticPropertyOperation *BKE_override_static_property_operation_find(
+ struct IDOverrideStaticProperty *override_property,
const char *subitem_refname, const char *subitem_locname,
const int subitem_refindex, const int subitem_locindex, const bool strict, bool *r_strict);
-struct IDOverridePropertyOperation *BKE_override_property_operation_get(
- struct IDOverrideProperty *override_property, const short operation,
+struct IDOverrideStaticPropertyOperation *BKE_override_static_property_operation_get(
+ struct IDOverrideStaticProperty *override_property, const short operation,
const char *subitem_refname, const char *subitem_locname,
const int subitem_refindex, const int subitem_locindex,
const bool strict, bool *r_strict, bool *r_created);
-void BKE_override_property_operation_delete(
- struct IDOverrideProperty *override_property, struct IDOverridePropertyOperation *override_property_operation);
+void BKE_override_static_property_operation_delete(
+ struct IDOverrideStaticProperty *override_property, struct IDOverrideStaticPropertyOperation *override_property_operation);
-bool BKE_override_status_check_local(struct ID *local);
-bool BKE_override_status_check_reference(struct ID *local);
+bool BKE_override_static_status_check_local(struct ID *local);
+bool BKE_override_static_status_check_reference(struct ID *local);
-bool BKE_override_operations_create(struct ID *local);
-void BKE_main_override_operations_create(struct Main *bmain);
+bool BKE_override_static_operations_create(struct ID *local);
+void BKE_main_override_static_operations_create(struct Main *bmain);
-void BKE_override_update(struct Main *bmain, struct ID *local);
-void BKE_main_override_update(struct Main *bmain);
+void BKE_override_static_update(struct Main *bmain, struct ID *local);
+void BKE_main_override_static_update(struct Main *bmain);
/* Storage (.blend file writing) part. */
/* For now, we just use a temp main list. */
-typedef struct Main OverrideStorage;
+typedef struct Main OverrideStaticStorage;
-OverrideStorage *BKE_override_operations_store_initialize(void);
-struct ID *BKE_override_operations_store_start(OverrideStorage *override_storage, struct ID *local);
-void BKE_override_operations_store_end(OverrideStorage *override_storage, struct ID *local);
-void BKE_override_operations_store_finalize(OverrideStorage *override_storage);
+OverrideStaticStorage *BKE_override_static_operations_store_initialize(void);
+struct ID *BKE_override_static_operations_store_start(OverrideStaticStorage *override_storage, struct ID *local);
+void BKE_override_static_operations_store_end(OverrideStaticStorage *override_storage, struct ID *local);
+void BKE_override_static_operations_store_finalize(OverrideStaticStorage *override_storage);
diff --git a/source/blender/blenkernel/intern/library_override.c b/source/blender/blenkernel/intern/library_override.c
index 2d345e47d4b..be0bbaca416 100644
--- a/source/blender/blenkernel/intern/library_override.c
+++ b/source/blender/blenkernel/intern/library_override.c
@@ -52,78 +52,78 @@
#define OVERRIDE_AUTO_CHECK_DELAY 0.2 /* 200ms between auto-override checks. */
-static void bke_override_property_copy(IDOverrideProperty *op_dst, IDOverrideProperty *op_src);
-static void bke_override_property_operation_copy(IDOverridePropertyOperation *opop_dst, IDOverridePropertyOperation *opop_src);
+static void bke_override_property_copy(IDOverrideStaticProperty *op_dst, IDOverrideStaticProperty *op_src);
+static void bke_override_property_operation_copy(IDOverrideStaticPropertyOperation *opop_dst, IDOverrideStaticPropertyOperation *opop_src);
-static void bke_override_property_clear(IDOverrideProperty *op);
-static void bke_override_property_operation_clear(IDOverridePropertyOperation *opop);
+static void bke_override_property_clear(IDOverrideStaticProperty *op);
+static void bke_override_property_operation_clear(IDOverrideStaticPropertyOperation *opop);
/** Initialize empty overriding of \a reference_id by \a local_id. */
-IDOverride *BKE_override_init(ID *local_id, ID *reference_id)
+IDOverrideStatic *BKE_override_static_init(ID *local_id, ID *reference_id)
{
/* If reference_id is NULL, we are creating an override template for purely local data.
* Else, reference *must* be linked data. */
BLI_assert(reference_id == NULL || reference_id->lib != NULL);
- BLI_assert(local_id->override == NULL);
+ BLI_assert(local_id->override_static == NULL);
- if (reference_id != NULL && reference_id->override != NULL && reference_id->override->reference == NULL) {
+ if (reference_id != NULL && reference_id->override_static != NULL && reference_id->override_static->reference == NULL) {
/* reference ID has an override template, use it! */
- BKE_override_copy(local_id, reference_id);
- return local_id->override;
+ BKE_override_static_copy(local_id, reference_id);
+ return local_id->override_static;
}
/* Else, generate new empty override. */
- local_id->override = MEM_callocN(sizeof(*local_id->override), __func__);
- local_id->override->reference = reference_id;
+ local_id->override_static = MEM_callocN(sizeof(*local_id->override_static), __func__);
+ local_id->override_static->reference = reference_id;
id_us_plus(reference_id);
- local_id->tag &= ~LIB_TAG_OVERRIDE_OK;
+ local_id->tag &= ~LIB_TAG_OVERRIDESTATIC_OK;
/* TODO do we want to add tag or flag to referee to mark it as such? */
- return local_id->override;
+ return local_id->override_static;
}
/** Deep copy of a whole override from \a src_id to \a dst_id. */
-void BKE_override_copy(ID *dst_id, const ID *src_id)
+void BKE_override_static_copy(ID *dst_id, const ID *src_id)
{
- BLI_assert(src_id->override != NULL);
+ BLI_assert(src_id->override_static != NULL);
- if (dst_id->override != NULL) {
- if (src_id->override == NULL) {
- BKE_override_free(&dst_id->override);
+ if (dst_id->override_static != NULL) {
+ if (src_id->override_static == NULL) {
+ BKE_override_static_free(&dst_id->override_static);
return;
}
else {
- BKE_override_clear(dst_id->override);
+ BKE_override_static_clear(dst_id->override_static);
}
}
- else if (src_id->override == NULL) {
+ else if (src_id->override_static == NULL) {
return;
}
else {
- BKE_override_init(dst_id, NULL);
+ BKE_override_static_init(dst_id, NULL);
}
/* Source is already overriding data, we copy it but reuse its reference for dest ID.
* otherwise, source is only an override template, it then becomes reference of dest ID. */
- dst_id->override->reference = src_id->override->reference ? src_id->override->reference : (ID *)src_id;
- id_us_plus(dst_id->override->reference);
+ dst_id->override_static->reference = src_id->override_static->reference ? src_id->override_static->reference : (ID *)src_id;
+ id_us_plus(dst_id->override_static->reference);
- BLI_duplicatelist(&dst_id->override->properties, &src_id->override->properties);
- for (IDOverrideProperty *op_dst = dst_id->override->properties.first, *op_src = src_id->override->properties.first;
+ BLI_duplicatelist(&dst_id->override_static->properties, &src_id->override_static->properties);
+ for (IDOverrideStaticProperty *op_dst = dst_id->override_static->properties.first, *op_src = src_id->override_static->properties.first;
op_dst;
op_dst = op_dst->next, op_src = op_src->next)
{
bke_override_property_copy(op_dst, op_src);
}
- dst_id->tag &= ~LIB_TAG_OVERRIDE_OK;
+ dst_id->tag &= ~LIB_TAG_OVERRIDESTATIC_OK;
}
/** Clear any overriding data from given \a override. */
-void BKE_override_clear(IDOverride *override)
+void BKE_override_static_clear(IDOverrideStatic *override)
{
BLI_assert(override != NULL);
- for (IDOverrideProperty *op = override->properties.first; op; op = op->next) {
+ for (IDOverrideStaticProperty *op = override->properties.first; op; op = op->next) {
bke_override_property_clear(op);
}
BLI_freelistN(&override->properties);
@@ -133,17 +133,17 @@ void BKE_override_clear(IDOverride *override)
}
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list