From 4bc08d09aedafb8986eb742b8d8c1a0a58876cd5 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Mon, 12 Oct 2015 13:46:58 +0200 Subject: Cleanup in BLO API: rename 'append' funcs to 'link', since none do append, but only linking of datablocks! --- source/gameengine/Converter/KX_BlenderSceneConverter.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source/gameengine/Converter/KX_BlenderSceneConverter.cpp') diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp index b58724ec3ac..e0319c5a749 100644 --- a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp +++ b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp @@ -861,7 +861,7 @@ static void load_datablocks(Main *main_tmp, BlendHandle *bpy_openlib, const char int i = 0; LinkNode *n = names; while (n) { - BLO_library_append_named_part(main_tmp, &bpy_openlib, (char *)n->link, idcode); + BLO_library_link_named_part(main_tmp, &bpy_openlib, (char *)n->link, idcode); n = (LinkNode *)n->next; i++; } @@ -905,7 +905,7 @@ KX_LibLoadStatus *KX_BlenderSceneConverter::LinkBlendFile(BlendHandle *bpy_openl short flag = 0; /* don't need any special options */ /* created only for linking, then freed */ - Main *main_tmp = BLO_library_append_begin(main_newlib, &bpy_openlib, (char *)path); + Main *main_tmp = BLO_library_link_begin(main_newlib, &bpy_openlib, (char *)path); load_datablocks(main_tmp, bpy_openlib, path, idcode); @@ -918,7 +918,7 @@ KX_LibLoadStatus *KX_BlenderSceneConverter::LinkBlendFile(BlendHandle *bpy_openl load_datablocks(main_tmp, bpy_openlib, path, ID_AC); } - BLO_library_append_end(NULL, main_tmp, &bpy_openlib, idcode, flag); + BLO_library_link_end(NULL, main_tmp, &bpy_openlib, idcode, flag); BLO_blendhandle_close(bpy_openlib); -- cgit v1.2.3