[Bf-blender-cvs] [7fc7e325efb] master: Fix T63082: Outliner allows assign grease pencil materials to mesh

[Antonioya]

Commit: 7fc7e325efbb1ccab181e32873f3ad49ed42755d
Author: Antonioya
Date:   Fri Mar 29 11:58:28 2019 +0100
Branches: master
https://developer.blender.org/rB7fc7e325efbb1ccab181e32873f3ad49ed42755d

Fix T63082: Outliner allows assign grease pencil materials to mesh

The grease pencil materials only can be assigned to objects of grease pencil type.

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

M	source/blender/editors/space_outliner/outliner_dragdrop.c

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

diff --git a/source/blender/editors/space_outliner/outliner_dragdrop.c b/source/blender/editors/space_outliner/outliner_dragdrop.c
index 77821ec0990..647fdeccb40 100644
--- a/source/blender/editors/space_outliner/outliner_dragdrop.c
+++ b/source/blender/editors/space_outliner/outliner_dragdrop.c
@@ -649,6 +649,11 @@ static int material_drop_invoke(bContext *C, wmOperator *UNUSED(op), const wmEve
 		return OPERATOR_CANCELLED;
 	}
 
+	/* only drop grease pencil material on grease pencil objects */
+	if ((ma->gp_style != NULL) && (ob->type != OB_GPENCIL)) {
+		return OPERATOR_CANCELLED;
+	}
+
 	assign_material(bmain, ob, ma, ob->totcol + 1, BKE_MAT_ASSIGN_USERPREF);
 
 	WM_event_add_notifier(C, NC_SPACE | ND_SPACE_VIEW3D, CTX_wm_view3d(C));