[Bf-blender-cvs] [2dbcb75] master: Minor naming cleanup.

Bastien Montagne noreply at git.blender.org
Fri Nov 11 23:18:14 CET 2016


Commit: 2dbcb75ed592ee5c821e8512a92b9d083d0c357d
Author: Bastien Montagne
Date:   Fri Nov 11 22:56:47 2016 +0100
Branches: master
https://developer.blender.org/rB2dbcb75ed592ee5c821e8512a92b9d083d0c357d

Minor naming cleanup.

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

M	source/blender/blenkernel/BKE_library_query.h
M	source/blender/blenkernel/intern/library.c
M	source/blender/blenkernel/intern/library_query.c

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

diff --git a/source/blender/blenkernel/BKE_library_query.h b/source/blender/blenkernel/BKE_library_query.h
index 1fd6719..b17eab6 100644
--- a/source/blender/blenkernel/BKE_library_query.h
+++ b/source/blender/blenkernel/BKE_library_query.h
@@ -88,7 +88,7 @@ bool BKE_library_ID_is_locally_used(struct Main *bmain, void *idv);
 bool BKE_library_ID_is_indirectly_used(struct Main *bmain, void *idv);
 void BKE_library_ID_test_usages(struct Main *bmain, void *idv, bool *is_used_local, bool *is_used_linked);
 
-void BKE_library_tag_unused_linked_data(struct Main *bmain, const bool do_init_tag);
+void BKE_library_unused_linked_data_tag(struct Main *bmain, const bool do_init_tag);
 void BKE_library_indirectly_used_data_tag_clear(struct Main *bmain);
 
 #endif  /* __BKE_LIBRARY_QUERY_H__ */
diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c
index d0610cd..d8d700d 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -1827,7 +1827,7 @@ void BKE_library_make_local(
 
 	/* Step 6: Try to find circle dependencies between indirectly-linked-only datablocks.
 	 * Those are fake 'usages' that prevent their deletion. See T49775 for nice ugly case. */
-	BKE_library_tag_unused_linked_data(bmain, false);
+	BKE_library_unused_linked_data_tag(bmain, false);
 	for (LinkNode *it = linked_loop_candidates; it; it = it->next) {
 		if (it->link == NULL) {
 			continue;
diff --git a/source/blender/blenkernel/intern/library_query.c b/source/blender/blenkernel/intern/library_query.c
index 05ca6f8..fa75c90 100644
--- a/source/blender/blenkernel/intern/library_query.c
+++ b/source/blender/blenkernel/intern/library_query.c
@@ -1207,7 +1207,7 @@ static int foreach_libblock_used_linked_data_tag_clear_cb(
  * \param do_init_tag if \a true, all linked data are checked, if \a false, only linked datablocks already tagged with
  *                    LIB_TAG_DOIT are checked.
  */
-void BKE_library_tag_unused_linked_data(Main *bmain, const bool do_init_tag)
+void BKE_library_unused_linked_data_set_tag(Main *bmain, const bool do_init_tag)
 {
 	ListBase *lb_array[MAX_LIBARRAY];




More information about the Bf-blender-cvs mailing list