[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55590] trunk/blender/source/blender/ editors/gpencil/drawgpencil.c: grease pencil xray option wasn' t being applied to single points in the 3d view.

Campbell Barton ideasman42 at gmail.com
Tue Mar 26 08:41:59 CET 2013


Revision: 55590
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55590
Author:   campbellbarton
Date:     2013-03-26 07:41:59 +0000 (Tue, 26 Mar 2013)
Log Message:
-----------
grease pencil xray option wasn't being applied to single points in the 3d view.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/gpencil/drawgpencil.c

Modified: trunk/blender/source/blender/editors/gpencil/drawgpencil.c
===================================================================
--- trunk/blender/source/blender/editors/gpencil/drawgpencil.c	2013-03-26 07:29:01 UTC (rev 55589)
+++ trunk/blender/source/blender/editors/gpencil/drawgpencil.c	2013-03-26 07:41:59 UTC (rev 55590)
@@ -499,9 +499,7 @@
 			continue;
 		
 		/* check which stroke-drawer to use */
-		if (gps->totpoints == 1)
-			gp_draw_stroke_point(gps->points, lthick, dflag, gps->flag, offsx, offsy, winx, winy);
-		else if (dflag & GP_DRAWDATA_ONLY3D) {
+		if (dflag & GP_DRAWDATA_ONLY3D) {
 			const int no_xray = (dflag & GP_DRAWDATA_NO_XRAY);
 			int mask_orig = 0;
 			
@@ -519,7 +517,12 @@
 #endif
 			}
 			
-			gp_draw_stroke_3d(gps->points, gps->totpoints, lthick, debug);
+			if (gps->totpoints == 1) {
+				gp_draw_stroke_point(gps->points, lthick, dflag, gps->flag, offsx, offsy, winx, winy);
+			}
+			else {
+				gp_draw_stroke_3d(gps->points, gps->totpoints, lthick, debug);
+			}
 			
 			if (no_xray) {
 				glDepthMask(mask_orig);
@@ -532,8 +535,14 @@
 #endif
 			}
 		}
-		else if (gps->totpoints > 1)
-			gp_draw_stroke(gps->points, gps->totpoints, lthick, dflag, gps->flag, debug, offsx, offsy, winx, winy);
+		else {
+			if (gps->totpoints == 1) {
+				gp_draw_stroke_point(gps->points, lthick, dflag, gps->flag, offsx, offsy, winx, winy);
+			}
+			else {
+				gp_draw_stroke(gps->points, gps->totpoints, lthick, dflag, gps->flag, debug, offsx, offsy, winx, winy);
+			}
+		}
 	}
 }
 




More information about the Bf-blender-cvs mailing list