[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13937] trunk/blender/source/blender/src/ drawaction.c: Bugfix:

[Joshua Leung]

Revision: 13937
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13937
Author:   aligorith
Date:     2008-03-02 02:17:17 +0100 (Sun, 02 Mar 2008)

Log Message:
-----------
Bugfix:

Disabled fully OpenGl-based drawing of keyframes in the Action Editor. This was apparently causing problems on some Intel cards... 

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

Modified: trunk/blender/source/blender/src/drawaction.c
===================================================================
--- trunk/blender/source/blender/src/drawaction.c	2008-03-02 00:26:13 UTC (rev 13936)
+++ trunk/blender/source/blender/src/drawaction.c	2008-03-02 01:17:17 UTC (rev 13937)
@@ -1218,6 +1218,7 @@
 	return NULL;
 }
 
+#if 0  // disabled, as some intel cards have problems with this
 /* Draw a simple diamond shape with a filled in center (in screen space) */
 static void draw_key_but(int x, int y, short w, short h, int sel)
 {
@@ -1247,6 +1248,7 @@
 	glVertex2i(xmin, yc);
 	glEnd();
 }
+#endif
 
 static void draw_keylist(gla2DDrawInfo *di, ListBase *keys, ListBase *blocks, float ypos)
 {
@@ -1300,11 +1302,12 @@
 			gla2DDrawTranslatePt(di, ak->cfra, ypos, &sc_x, &sc_y);
 			
 			/* draw using icons - old way which is slower but more proven */
-			//if(ak->sel & 1) BIF_icon_draw_aspect(sc_x-7, sc_y-6, ICON_SPACE2, 1.0f);
-			//else BIF_icon_draw_aspect(sc_x-7, sc_y-6, ICON_SPACE3, 1.0f);
+			if(ak->sel & SELECT) BIF_icon_draw_aspect(sc_x-7, sc_y-6, ICON_SPACE2, 1.0f);
+			else BIF_icon_draw_aspect(sc_x-7, sc_y-6, ICON_SPACE3, 1.0f);
 			
 			/* draw using OpenGL - slightly uglier but faster */
-			draw_key_but(sc_x-5, sc_y-4, 11, 11, (ak->sel & SELECT));
+			// 	NOTE: disabled for now, as some intel cards seem to have problems with this
+			//draw_key_but(sc_x-5, sc_y-4, 11, 11, (ak->sel & SELECT));
 		}	
 	}