Merging r39717 through r39983 from trunk into soc-2011-tomato
[blender.git] / source / blender / editors / gpencil / drawgpencil.c
index cfa9585..0b16a97 100644 (file)
@@ -688,6 +688,7 @@ void draw_gpencil_2dimage (bContext *C, ImBuf *ibuf)
        /* calculate rect */
        switch (sa->spacetype) {
                case SPACE_IMAGE: /* image */
+               case SPACE_CLIP: /* clip */
                {
                        
                        /* just draw using standard scaling (settings here are currently ignored anyways) */
@@ -761,7 +762,7 @@ void draw_gpencil_view2d (bContext *C, short onlyv2d)
        
        /* special hack for Image Editor */
        // FIXME: the opengl poly-strokes don't draw at right thickness when done this way, so disabled
-       if (sa->spacetype == SPACE_IMAGE)
+       if (ELEM(sa->spacetype, SPACE_IMAGE, SPACE_CLIP))
                dflag |= GP_DRAWDATA_IEDITHACK;
        
        /* draw it! */