From 641d4e2b7fc4fd563c3c2dd880c8c412dd35ce9a Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 28 Dec 2015 17:17:25 +1100 Subject: Cleanup: use BLI_libblock prefix for id functions - test_idbutton -> BLI_libblock_ensure_unique_name (not only used from UI) - BKE_rename_id -> BKE_libblock_rename (always pass valid main) also rename: - name_uiprefix_id -> BKE_id_uiprefix --- source/blender/collada/DocumentImporter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/collada') diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp index 45b8a4fe5d4..45dcf436473 100644 --- a/source/blender/collada/DocumentImporter.cpp +++ b/source/blender/collada/DocumentImporter.cpp @@ -654,7 +654,7 @@ std::vector *DocumentImporter::write_node(COLLADAFW::Node *node, COLLA for (std::vector::iterator it = objects_done->begin(); it != objects_done->end(); ++it) { ob = *it; std::string nodename = node->getName().size() ? node->getName() : node->getOriginalId(); - BKE_rename_id(NULL, &ob->id, (char *)nodename.c_str()); + BKE_libblock_rename(G.main, &ob->id, (char *)nodename.c_str()); object_map.insert(std::pair(node->getUniqueId(), ob)); node_map[node->getUniqueId()] = node; -- cgit v1.2.3