[Bf-blender-cvs] [7cb871a3807] greasepencil-object: Check object type

[Antonio Vazquez]

Commit: 7cb871a3807162b0d75ab2a0129d7ef2aef26422
Author: Antonio Vazquez
Date:   Thu Oct 12 13:09:18 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB7cb871a3807162b0d75ab2a0129d7ef2aef26422

Check object type

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

M	source/blender/draw/engines/gpencil/gpencil_engine.c

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

diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c
index ed7f2db6c50..29e60521561 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@ -279,7 +279,7 @@ static void GPENCIL_cache_init(void *vedata)
 		}
 
 		ob = draw_ctx->obact;
-		if (ob) {
+		if ((ob) && (ob->type == OB_GPENCIL)) {
 			gpd = ob->gpd;
 		}
 		bGPDpaletteref *palslot = BKE_gpencil_paletteslot_get_active(gpd);