Commit: db79537dbcf0a5fb2da883457151eb3bdfe5e0e7
Author: Bastien Montagne
Date:   Fri Jul 8 17:39:03 2016 +0200
Branches: master
https://developer.blender.org/rBdb79537dbcf0a5fb2da883457151eb3bdfe5e0e7

Fix own very stupid mistake in BKE_library_idtype_can_use_idtype() usage 
(inverted arguments).

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

M       source/blender/blenkernel/intern/library_query.c

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

diff --git a/source/blender/blenkernel/intern/library_query.c 
b/source/blender/blenkernel/intern/library_query.c
index fbf4575..b81e937 100644
--- a/source/blender/blenkernel/intern/library_query.c
+++ b/source/blender/blenkernel/intern/library_query.c
@@ -995,7 +995,7 @@ static bool library_ID_is_used(Main *bmain, void *idv, 
const bool check_linked)
        while (i-- && !is_defined) {
                ID *id_curr = lb_array[i]->first;
 
-               if (!id_curr || 
!BKE_library_idtype_can_use_idtype(GS(id->name), GS(id_curr->name))) {
+               if (!id_curr || 
!BKE_library_idtype_can_use_idtype(GS(id_curr->name), GS(id->name))) {
                        continue;
                }
 
@@ -1047,7 +1047,7 @@ void BKE_library_ID_test_usages(Main *bmain, void *idv, 
bool *is_used_local, boo
        while (i-- && !is_defined) {
                ID *id_curr = lb_array[i]->first;
 
-               if (!id_curr || 
!BKE_library_idtype_can_use_idtype(GS(id->name), GS(id_curr->name))) {
+               if (!id_curr || 
!BKE_library_idtype_can_use_idtype(GS(id_curr->name), GS(id->name))) {
                        continue;
                }

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to