[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53072] trunk/blender/source/blender/ editors/space_view3d/view3d_draw.c: missed this recent commit, while drawing grease pencil, draw if 'Render Only' is on.

Campbell Barton ideasman42 at gmail.com
Mon Dec 17 06:36:07 CET 2012


Revision: 53072
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53072
Author:   campbellbarton
Date:     2012-12-17 05:36:00 +0000 (Mon, 17 Dec 2012)
Log Message:
-----------
missed this recent commit, while drawing grease pencil, draw if 'Render Only' is on.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/view3d_draw.c

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_draw.c	2012-12-17 04:44:39 UTC (rev 53071)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_draw.c	2012-12-17 05:36:00 UTC (rev 53072)
@@ -3182,14 +3182,14 @@
 		glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
 	}
 
+	if (v3d->flag2 & V3D_SHOW_GPENCIL) {
+		/* draw grease-pencil stuff - needed to get paint-buffer shown too (since it's 2D) */
+		draw_gpencil_view3d(scene, v3d, ar, FALSE);
+	}
+
 	if ((v3d->flag2 & V3D_RENDER_OVERRIDE) == 0) {
 		Object *ob;
 
-		if (v3d->flag2 & V3D_SHOW_GPENCIL) {
-			/* draw grease-pencil stuff - needed to get paint-buffer shown too (since it's 2D) */
-			draw_gpencil_view3d(scene, v3d, ar, FALSE);
-		}
-
 		drawcursor(scene, ar, v3d);
 
 		if (U.uiflag & USER_SHOW_ROTVIEWICON)




More information about the Bf-blender-cvs mailing list