[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47741] trunk/blender/source/blender/ editors/space_clip/space_clip.c: Draw grease pencil after masks

[Sergey Sharybin]

Revision: 47741
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47741
Author:   nazgul
Date:     2012-06-11 11:54:16 +0000 (Mon, 11 Jun 2012)
Log Message:
-----------
Draw grease pencil after masks

Looks like drawing grease pencil before masks was affecting projection matrix
somehow which made masks invisible

Anyway, drawing GP actually shall happen after masks to match how it works
in other areas.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_clip/space_clip.c

Modified: trunk/blender/source/blender/editors/space_clip/space_clip.c
===================================================================
--- trunk/blender/source/blender/editors/space_clip/space_clip.c        
2012-06-11 11:43:06 UTC (rev 47740)
+++ trunk/blender/source/blender/editors/space_clip/space_clip.c        
2012-06-11 11:54:16 UTC (rev 47741)
@@ -1101,9 +1101,6 @@
 
        clip_draw_main(sc, ar, scene);
 
-       /* Grease Pencil */
-       clip_draw_grease_pencil((bContext *)C, 1);
-
        if (sc->mode == SC_MODE_MASKEDIT) {
                int x, y;
                int width, height;
@@ -1147,6 +1144,9 @@
                glPopMatrix();
        }
 
+       /* Grease Pencil */
+       clip_draw_grease_pencil((bContext *)C, 1);
+
        /* reset view matrix */
        UI_view2d_view_restore(C);
 

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs