Commit: 677c716c0f299b2b6c8c239c7919e1786915f747
Author: Bastien Montagne
Date: Mon Dec 8 19:21:39 2014 +0100
Branches: asset-experiments
https://developer.blender.org/rB677c716c0f299b2b6c8c239c7919e1786915f747
Fix two very stupid bugs!
===================================================================
M source/blender/windowmanager/intern/wm_operators.c
===================================================================
diff --git a/source/blender/windowmanager/intern/wm_operators.c
b/source/blender/windowmanager/intern/wm_operators.c
index 00e07ac..054ecb5 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -2660,7 +2660,7 @@ static int wm_link_append_exec(bContext *C, wmOperator
*op)
BLI_join_dirfile(path, sizeof(path), dir, relname);
if (BLO_library_path_explode(path, curr_libname,
&group, &name)) {
- if (group || name) {
+ if (!group || !name) {
continue;
}
@@ -2735,12 +2735,6 @@ static int wm_link_append_exec(bContext *C, wmOperator
*op)
if ((idcode == curr_idcode) &&
(BLI_path_cmp(curr_libname, libname) == 0)) {
BLO_library_append_named_part_ex(C, mainl, &bh, name, idcode, flag);
}
- else {
- BLI_join_dirfile(path,
sizeof(path), curr_libname, group);
- if
(!BLI_gset_haskey(todo_libraries, curr_libname)) {
-
BLI_gset_insert(todo_libraries, BLI_strdup(curr_libname));
- }
- }
}
}
RNA_END;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
