[Bf-blender-cvs] [dad0c31] master: Fix renaming error in last commit
Campbell Barton
noreply at git.blender.org
Sat Nov 12 00:16:21 CET 2016
Commit: dad0c31ceb40e2142b432427cbba7d86cabcf300
Author: Campbell Barton
Date: Sat Nov 12 10:29:38 2016 +1100
Branches: master
https://developer.blender.org/rBdad0c31ceb40e2142b432427cbba7d86cabcf300
Fix renaming error in last commit
===================================================================
M source/blender/blenkernel/BKE_library_query.h
M source/blender/blenkernel/intern/library.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_library_query.h b/source/blender/blenkernel/BKE_library_query.h
index b17eab6..a747010 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_unused_linked_data_tag(struct Main *bmain, const bool do_init_tag);
+void BKE_library_unused_linked_data_set_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 823901d..024fa3b 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -1828,7 +1828,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_unused_linked_data_tag(bmain, false);
+ BKE_library_unused_linked_data_set_tag(bmain, false);
for (LinkNode *it = linked_loop_candidates; it; it = it->next) {
if (it->link == NULL) {
continue;
More information about the Bf-blender-cvs
mailing list