[Bf-blender-cvs] [566dd4e] master: Cleanup: add missing ID types to BKE_library_idtype_can_use_idtype().

Bastien Montagne noreply at git.blender.org
Sat Aug 6 12:56:55 CEST 2016


Commit: 566dd4e8a5091ba07c95ad49e891a0b4a3ee8ce2
Author: Bastien Montagne
Date:   Sat Aug 6 12:56:15 2016 +0200
Branches: master
https://developer.blender.org/rB566dd4e8a5091ba07c95ad49e891a0b4a3ee8ce2

Cleanup: add missing ID types to BKE_library_idtype_can_use_idtype().

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

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 b0adf64..cb86433 100644
--- a/source/blender/blenkernel/intern/library_query.c
+++ b/source/blender/blenkernel/intern/library_query.c
@@ -903,7 +903,7 @@ bool BKE_library_idtype_can_use_idtype(const short id_type_owner, const short id
 		return id_type_can_have_animdata(id_type_owner);
 	}
 
-	switch (id_type_owner) {
+	switch ((ID_Type)id_type_owner) {
 		case ID_LI:
 			return ELEM(id_type_used, ID_LI);
 		case ID_SCE:
@@ -962,9 +962,24 @@ bool BKE_library_idtype_can_use_idtype(const short id_type_owner, const short id
 			return ELEM(id_type_used, ID_MC);  /* WARNING! mask->parent.id, not typed. */
 		case ID_LS:
 			return (ELEM(id_type_used, ID_TE, ID_OB) || BKE_library_idtype_can_use_idtype(ID_NT, id_type_used));
-		default:
+		case ID_IM:
+		case ID_VF:
+		case ID_TXT:
+		case ID_SO:
+		case ID_AR:
+		case ID_AC:
+		case ID_GD:
+		case ID_WM:
+		case ID_PAL:
+		case ID_PC:
+		case ID_CF:
+			/* Those types never use/reference other IDs... */
+			return false;
+		case ID_IP:
+			/* Deprecated... */
 			return false;
 	}
+	return false;
 }




More information about the Bf-blender-cvs mailing list