From c8a62e4f50290f560bc09160daa1027a36d564cb Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Tue, 14 Jul 2020 15:27:41 +0200 Subject: [PATCH] Cleanup: function name not following its module conventions. --- source/blender/blenkernel/BKE_lib_override.h | 8 ++++---- source/blender/blenkernel/intern/lib_override.c | 8 ++++---- source/blender/editors/object/object_relations.c | 2 +- source/blender/editors/space_outliner/outliner_tools.c | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/source/blender/blenkernel/BKE_lib_override.h b/source/blender/blenkernel/BKE_lib_override.h index 07baebf54a9..8f6603e28ae 100644 --- a/source/blender/blenkernel/BKE_lib_override.h +++ b/source/blender/blenkernel/BKE_lib_override.h @@ -63,10 +63,10 @@ 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); -void BKE_lib_override_dependencies_tag(struct Main *bmain, - struct ID *id_root, - const uint tag, - const bool do_create_main_relashionships); +void BKE_lib_override_library_dependencies_tag(struct Main *bmain, + struct ID *id_root, + const uint tag, + const bool do_create_main_relashionships); struct IDOverrideLibraryProperty *BKE_lib_override_library_property_find( struct IDOverrideLibrary *override, const char *rna_path); diff --git a/source/blender/blenkernel/intern/lib_override.c b/source/blender/blenkernel/intern/lib_override.c index d2730f1fa19..58856729f24 100644 --- a/source/blender/blenkernel/intern/lib_override.c +++ b/source/blender/blenkernel/intern/lib_override.c @@ -386,10 +386,10 @@ static bool lib_override_hierarchy_recursive_tag(Main *bmain, ID *id) * \param do_create_main_relashionships Whether main relations needs to be created or already exist * (in any case, they will be freed by this function). */ -void BKE_lib_override_dependencies_tag(struct Main *bmain, - struct ID *id_root, - const uint tag, - const bool do_create_main_relashionships) +void BKE_lib_override_library_dependencies_tag(struct Main *bmain, + struct ID *id_root, + const uint tag, + const bool do_create_main_relashionships) { id_root->tag |= tag; diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c index 6186eefb214..7c68b41116f 100644 --- a/source/blender/editors/object/object_relations.c +++ b/source/blender/editors/object/object_relations.c @@ -2378,7 +2378,7 @@ static int make_override_library_exec(bContext *C, wmOperator *op) } /* Note that this call will also free the main relations data we created above. */ - BKE_lib_override_dependencies_tag(bmain, id_root, LIB_TAG_DOIT, false); + BKE_lib_override_library_dependencies_tag(bmain, id_root, LIB_TAG_DOIT, false); ID *id; FOREACH_MAIN_ID_BEGIN (bmain, id) { diff --git a/source/blender/editors/space_outliner/outliner_tools.c b/source/blender/editors/space_outliner/outliner_tools.c index ef5e40cdf78..f0287984268 100644 --- a/source/blender/editors/space_outliner/outliner_tools.c +++ b/source/blender/editors/space_outliner/outliner_tools.c @@ -789,7 +789,7 @@ static void id_override_library_cb(bContext *C, te->store_elem->id->tag |= LIB_TAG_DOIT; printf("%s: Tagging parent id %s\n", __func__, te->store_elem->id->name); } - BKE_lib_override_dependencies_tag(bmain, id_root, LIB_TAG_DOIT, true); + BKE_lib_override_library_dependencies_tag(bmain, id_root, LIB_TAG_DOIT, true); BKE_lib_override_library_create_from_tag(bmain); } else if (ID_IS_OVERRIDABLE_LIBRARY(id_root)) {