[Bf-blender-cvs] [a1a7e3a10c3] greasepencil-object: Only draw strokes if active object is grease pencil

[Antonio Vazquez]

Commit: a1a7e3a10c39a4ab2edb24abb37591c3575dc95b
Author: Antonio Vazquez
Date:   Mon Apr 10 13:34:40 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBa1a7e3a10c39a4ab2edb24abb37591c3575dc95b

Only draw strokes if active object is grease pencil

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

M	source/blender/editors/space_view3d/view3d_draw_legacy.c

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

diff --git a/source/blender/editors/space_view3d/view3d_draw_legacy.c b/source/blender/editors/space_view3d/view3d_draw_legacy.c
index a4802ccdc59..6a2c216035e 100644
--- a/source/blender/editors/space_view3d/view3d_draw_legacy.c
+++ b/source/blender/editors/space_view3d/view3d_draw_legacy.c
@@ -2563,7 +2563,7 @@ static void view3d_main_region_draw_info(const bContext *C, Scene *scene,
 		/* draw grease-pencil stuff - needed to get paint-buffer shown too (since it's 2D) */
 		ED_gpencil_draw_view3d(wm, scene, v3d, ar, false);
 		Object *obact = CTX_data_active_object(C);
-		if (obact) {
+		if (obact && obact->type == OB_GPENCIL) {
 			ED_gpencil_draw_view3d_object(wm, scene, obact, v3d, ar, false);
 		}
 	}