[Bf-blender-cvs] [38f1aa8d665] greasepencil-object: Replace allowed types from Palettes to Materials

Antonio Vazquez noreply at git.blender.org
Thu Apr 26 16:15:20 CEST 2018


Commit: 38f1aa8d6652532822c4c68186ff0fdf224168ac
Author: Antonio Vazquez
Date:   Thu Apr 26 16:15:11 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB38f1aa8d6652532822c4c68186ff0fdf224168ac

Replace allowed types from Palettes to Materials

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

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 a89eb693355..f4b6058bcb9 100644
--- a/source/blender/blenkernel/intern/library_query.c
+++ b/source/blender/blenkernel/intern/library_query.c
@@ -1065,7 +1065,7 @@ bool BKE_library_id_can_use_idtype(ID *id_owner, const short id_type_used)
 			return true;
 #endif
 		case ID_BR:
-			return ELEM(id_type_used, ID_BR, ID_IM, ID_PC, ID_TE, ID_PAL);
+			return ELEM(id_type_used, ID_BR, ID_IM, ID_PC, ID_TE, ID_MA);
 		case ID_PA:
 			return ELEM(id_type_used, ID_OB, ID_GR, ID_TE);
 		case ID_MC:
@@ -1077,7 +1077,7 @@ bool BKE_library_id_can_use_idtype(ID *id_owner, const short id_type_used)
 		case ID_LP:
 			return ELEM(id_type_used, ID_IM);
 		case ID_GD:
-			return ELEM(id_type_used, ID_PAL);
+			return ELEM(id_type_used, ID_MA);
 		case ID_WS:
 		case ID_IM:
 		case ID_VF:



More information about the Bf-blender-cvs mailing list