[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16895] trunk/blender/source/blender/src/ drawgpencil.c: Grease Pencil bugfix:

Joshua Leung aligorith at gmail.com
Fri Oct 3 11:41:29 CEST 2008


Revision: 16895
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16895
Author:   aligorith
Date:     2008-10-03 11:40:48 +0200 (Fri, 03 Oct 2008)

Log Message:
-----------
Grease Pencil bugfix:

Disabled fancy 'dot' drawing for Image Editor. This is still just a quick-fix (like for fancy strokes), and it would be nice to get the scaling right someday.

Modified Paths:
--------------
    trunk/blender/source/blender/src/drawgpencil.c

Modified: trunk/blender/source/blender/src/drawgpencil.c
===================================================================
--- trunk/blender/source/blender/src/drawgpencil.c	2008-10-03 06:27:41 UTC (rev 16894)
+++ trunk/blender/source/blender/src/drawgpencil.c	2008-10-03 09:40:48 UTC (rev 16895)
@@ -433,13 +433,18 @@
 			co[1]= (points->y / 1000 * winy);
 		}
 		
-		/* if thickness is less than GP_DRAWTHICKNESS_SPECIAL, simple opengl point will do */
-		if (thickness < GP_DRAWTHICKNESS_SPECIAL) {
+		/* if thickness is less than GP_DRAWTHICKNESS_SPECIAL, simple dot looks ok
+		 * 	- also mandatory in if Image Editor 'image-based' dot
+		 */
+		if ( (thickness < GP_DRAWTHICKNESS_SPECIAL) ||
+			 ((curarea->spacetype==SPACE_IMAGE) && (sflag & GP_STROKE_2DSPACE)) )
+		{
 			glBegin(GL_POINTS);
 				glVertex2fv(co);
 			glEnd();
 		}
-		else {
+		else 
+		{
 			/* draw filled circle as is done in circf (but without the matrix push/pops which screwed things up) */
 			GLUquadricObj *qobj = gluNewQuadric(); 
 			
@@ -495,7 +500,7 @@
 							short debug, int offsx, int offsy, int winx, int winy)
 {	
 	/* if thickness is less than GP_DRAWTHICKNESS_SPECIAL, 'smooth' opengl lines look better
-	 * 	- but NOT if Image Editor 'image-based' stroke
+	 * 	- 'smooth' opengl lines are also required if Image Editor 'image-based' stroke
 	 */
 	if ( (thickness < GP_DRAWTHICKNESS_SPECIAL) || 
 		 ((curarea->spacetype==SPACE_IMAGE) && (dflag & GP_DRAWDATA_ONLYV2D)) ) 





More information about the Bf-blender-cvs mailing list