Revision: 17011
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17011
Author: aligorith
Date: 2008-10-11 00:49:17 +0200 (Sat, 11 Oct 2008)
Log Message:
-----------
Bugfix #17802: Grease Pencil still draws when not shown in Image Editor
Added missing check for this case.
Modified Paths:
--------------
trunk/blender/source/blender/src/gpencil.c
Modified: trunk/blender/source/blender/src/gpencil.c
===================================================================
--- trunk/blender/source/blender/src/gpencil.c 2008-10-10 20:23:49 UTC (rev
17010)
+++ trunk/blender/source/blender/src/gpencil.c 2008-10-10 22:49:17 UTC (rev
17011)
@@ -1754,6 +1754,14 @@
p->sa= curarea;
p->v2d= &sima->v2d;
p->ibuf= BKE_image_get_ibuf(sima->image, &sima->iuser);
+
+ /* check that gpencil data is allowed to be drawn */
+ if ((sima->flag & SI_DISPGP)==0) {
+ p->status= GP_STATUS_ERROR;
+ if (G.f & G_DEBUG)
+ printf("Error: In active view, Grease
Pencil not shown \n");
+ return;
+ }
}
break;
/* unsupported views */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
