[Bf-blender-cvs] [e75e29ee478] master: Cleanup: Rename `BKE_library_override_` functions to `BKE_lib_override_library_`

Bastien Montagne noreply at git.blender.org
Mon Feb 10 18:08:14 CET 2020


Commit: e75e29ee478592742defb80d6d992173f4a635df
Author: Bastien Montagne
Date:   Mon Feb 10 18:05:19 2020 +0100
Branches: master
https://developer.blender.org/rBe75e29ee478592742defb80d6d992173f4a635df

Cleanup: Rename `BKE_library_override_` functions to `BKE_lib_override_library_`

pqrt of T72604.

===================================================================

M	source/blender/blenkernel/BKE_lib_override.h
M	source/blender/blenkernel/intern/lib_id_delete.c
M	source/blender/blenkernel/intern/lib_override.c
M	source/blender/blenkernel/intern/undo_system.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/interface/interface_templates.c
M	source/blender/editors/object/object_relations.c
M	source/blender/editors/space_outliner/outliner_tools.c
M	source/blender/makesrna/intern/rna_ID.c
M	source/blender/makesrna/intern/rna_access_compare_override.c
M	source/blender/makesrna/intern/rna_rna.c
M	source/blender/python/intern/bpy_app.c
M	source/blender/windowmanager/intern/wm_files.c
M	source/creator/creator_args.c

===================================================================

diff --git a/source/blender/blenkernel/BKE_lib_override.h b/source/blender/blenkernel/BKE_lib_override.h
index 2c03fbcc550..29b19af7abf 100644
--- a/source/blender/blenkernel/BKE_lib_override.h
+++ b/source/blender/blenkernel/BKE_lib_override.h
@@ -45,27 +45,28 @@ struct IDOverrideLibraryProperty;
 struct IDOverrideLibraryPropertyOperation;
 struct Main;
 
-void BKE_override_library_enable(const bool do_enable);
-bool BKE_override_library_is_enabled(void);
+void BKE_lib_override_library_enable(const bool do_enable);
+bool BKE_lib_override_library_is_enabled(void);
 
-struct IDOverrideLibrary *BKE_override_library_init(struct ID *local_id, struct ID *reference_id);
-void BKE_override_library_copy(struct ID *dst_id, const struct ID *src_id);
-void BKE_override_library_clear(struct IDOverrideLibrary *override, const bool do_id_user);
-void BKE_override_library_free(struct IDOverrideLibrary **override, const bool do_id_user);
+struct IDOverrideLibrary *BKE_lib_override_library_init(struct ID *local_id,
+                                                        struct ID *reference_id);
+void BKE_lib_override_library_copy(struct ID *dst_id, const struct ID *src_id);
+void BKE_lib_override_library_clear(struct IDOverrideLibrary *override, const bool do_id_user);
+void BKE_lib_override_library_free(struct IDOverrideLibrary **override, const bool do_id_user);
 
-struct ID *BKE_override_library_create_from_id(struct Main *bmain,
-                                               struct ID *reference_id,
-                                               const bool do_tagged_remap);
-bool BKE_override_library_create_from_tag(struct Main *bmain);
+struct ID *BKE_lib_override_library_create_from_id(struct Main *bmain,
+                                                   struct ID *reference_id,
+                                                   const bool do_tagged_remap);
+bool BKE_lib_override_library_create_from_tag(struct Main *bmain);
 
-struct IDOverrideLibraryProperty *BKE_override_library_property_find(
+struct IDOverrideLibraryProperty *BKE_lib_override_library_property_find(
     struct IDOverrideLibrary *override, const char *rna_path);
-struct IDOverrideLibraryProperty *BKE_override_library_property_get(
+struct IDOverrideLibraryProperty *BKE_lib_override_library_property_get(
     struct IDOverrideLibrary *override, const char *rna_path, bool *r_created);
-void BKE_override_library_property_delete(struct IDOverrideLibrary *override,
-                                          struct IDOverrideLibraryProperty *override_property);
+void BKE_lib_override_library_property_delete(struct IDOverrideLibrary *override,
+                                              struct IDOverrideLibraryProperty *override_property);
 
-struct IDOverrideLibraryPropertyOperation *BKE_override_library_property_operation_find(
+struct IDOverrideLibraryPropertyOperation *BKE_lib_override_library_property_operation_find(
     struct IDOverrideLibraryProperty *override_property,
     const char *subitem_refname,
     const char *subitem_locname,
@@ -73,7 +74,7 @@ struct IDOverrideLibraryPropertyOperation *BKE_override_library_property_operati
     const int subitem_locindex,
     const bool strict,
     bool *r_strict);
-struct IDOverrideLibraryPropertyOperation *BKE_override_library_property_operation_get(
+struct IDOverrideLibraryPropertyOperation *BKE_lib_override_library_property_operation_get(
     struct IDOverrideLibraryProperty *override_property,
     const short operation,
     const char *subitem_refname,
@@ -83,32 +84,31 @@ struct IDOverrideLibraryPropertyOperation *BKE_override_library_property_operati
     const bool strict,
     bool *r_strict,
     bool *r_created);
-void BKE_override_library_property_operation_delete(
+void BKE_lib_override_library_property_operation_delete(
     struct IDOverrideLibraryProperty *override_property,
     struct IDOverrideLibraryPropertyOperation *override_property_operation);
 
-bool BKE_override_library_status_check_local(struct Main *bmain, struct ID *local);
-bool BKE_override_library_status_check_reference(struct Main *bmain, struct ID *local);
+bool BKE_lib_override_library_status_check_local(struct Main *bmain, struct ID *local);
+bool BKE_lib_override_library_status_check_reference(struct Main *bmain, struct ID *local);
 
-bool BKE_override_library_operations_create(struct Main *bmain,
-                                            struct ID *local,
-                                            const bool force_auto);
-void BKE_main_override_library_operations_create(struct Main *bmain, const bool force_auto);
+bool BKE_lib_override_library_operations_create(struct Main *bmain,
+                                                struct ID *local,
+                                                const bool force_auto);
+void BKE_lib_override_library_main_operations_create(struct Main *bmain, const bool force_auto);
 
-void BKE_override_library_update(struct Main *bmain, struct ID *local);
-void BKE_main_override_library_update(struct Main *bmain);
+void BKE_lib_override_library_update(struct Main *bmain, struct ID *local);
+void BKE_lib_override_library_main_update(struct Main *bmain);
 
 /* Storage (.blend file writing) part. */
 
 /* For now, we just use a temp main list. */
 typedef struct Main OverrideLibraryStorage;
 
-OverrideLibraryStorage *BKE_override_library_operations_store_initialize(void);
-struct ID *BKE_override_library_operations_store_start(struct Main *bmain,
-                                                       OverrideLibraryStorage *override_storage,
-                                                       struct ID *local);
-void BKE_override_library_operations_store_end(OverrideLibraryStorage *override_storage,
-                                               struct ID *local);
-void BKE_override_library_operations_store_finalize(OverrideLibraryStorage *override_storage);
+OverrideLibraryStorage *BKE_lib_override_library_operations_store_initialize(void);
+struct ID *BKE_lib_override_library_operations_store_start(
+    struct Main *bmain, OverrideLibraryStorage *override_storage, struct ID *local);
+void BKE_lib_override_library_operations_store_end(OverrideLibraryStorage *override_storage,
+                                                   struct ID *local);
+void BKE_lib_override_library_operations_store_finalize(OverrideLibraryStorage *override_storage);
 
 #endif /* __BKE_LIB_OVERRIDE_H__ */
diff --git a/source/blender/blenkernel/intern/lib_id_delete.c b/source/blender/blenkernel/intern/lib_id_delete.c
index 1be2a44cbb9..dd97a420ba6 100644
--- a/source/blender/blenkernel/intern/lib_id_delete.c
+++ b/source/blender/blenkernel/intern/lib_id_delete.c
@@ -119,7 +119,7 @@ void BKE_libblock_free_data(ID *id, const bool do_id_user)
   }
 
   if (id->override_library) {
-    BKE_override_library_free(&id->override_library, do_id_user);
+    BKE_lib_override_library_free(&id->override_library, do_id_user);
   }
 
   /* XXX TODO remove animdata handling from each type's freeing func,
diff --git a/source/blender/blenkernel/intern/lib_override.c b/source/blender/blenkernel/intern/lib_override.c
index 4985dd1eb51..8fecad5a975 100644
--- a/source/blender/blenkernel/intern/lib_override.c
+++ b/source/blender/blenkernel/intern/lib_override.c
@@ -50,30 +50,31 @@
 
 #define OVERRIDE_AUTO_CHECK_DELAY 0.2 /* 200ms between auto-override checks. */
 
-static void bke_override_property_copy(IDOverrideLibraryProperty *op_dst,
-                                       IDOverrideLibraryProperty *op_src);
-static void bke_override_property_operation_copy(IDOverrideLibraryPropertyOperation *opop_dst,
-                                                 IDOverrideLibraryPropertyOperation *opop_src);
+static void lib_override_library_property_copy(IDOverrideLibraryProperty *op_dst,
+                                               IDOverrideLibraryProperty *op_src);
+static void lib_override_library_property_operation_copy(
+    IDOverrideLibraryPropertyOperation *opop_dst, IDOverrideLibraryPropertyOperation *opop_src);
 
-static void bke_override_property_clear(IDOverrideLibraryProperty *op);
-static void bke_override_property_operation_clear(IDOverrideLibraryPropertyOperation *opop);
+static void lib_override_library_property_clear(IDOverrideLibraryProperty *op);
+static void lib_override_library_property_operation_clear(
+    IDOverrideLibraryPropertyOperation *opop);
 
 /* Temp, for until library override is ready and tested enough to go 'public',
  * we hide it by default in UI and such. */
-static bool _override_library_enabled = true;
+static bool _lib_override_library_enabled = true;
 
-void BKE_override_library_enable(const bool do_enable)
+void BKE_lib_override_library_enable(const bool do_enable)
 {
-  _override_library_enabled = do_enable;
+  _lib_override_library_enabled = do_enable;
 }
 
-bool BKE_override_library_is_enabled()
+bool BKE_lib_override_library_is_enabled()
 {
-  return _override_library_enabled;
+  return _lib_override_library_enabled;
 }
 
 /** Initialize empty overriding of \a reference_id by \a local_id. */
-IDOverrideLibrary *BKE_override_library_init(ID *local_id, ID *reference_id)
+IDOverrideLibrary *BKE_lib_override_library_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. */
@@ -89,7 +90,7 @@ IDOverrideLibrary *BKE_override_library_init(ID *local_id, ID *reference_id)
 
   if (ancestor_id != NULL && ancestor_id->override_library != NULL) {
     /* Original ID has a template, use it! */
-    BKE_override_library_copy(local_id, ancestor_id);
+    BKE_lib_override_library_copy(local_id, ancestor_id);
     if (local_id->override_library->reference != reference_id) {
       id_us_min(local_id->override_library->reference);
       local_id->override_library->reference = reference_id;
@@ -108,24 +109,24 @@ IDOverrideLibrary *BKE_override_library_init(ID *local_id, ID *reference_id)
 }
 
 /** Deep copy of a whole override from \a src_id to \a dst_id. */
-void BKE_override_library_copy(ID *dst_id, const ID *src_id)
+void BKE_lib_override_library_copy(ID *dst_id, const ID *src_id)
 {
   BLI_a

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list