[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56170] trunk/blender/source/blender/ editors: UI drawing fix:

[Ton Roosendaal]

Revision: 56170
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56170
Author:   ton
Date:     2013-04-19 15:02:37 +0000 (Fri, 19 Apr 2013)
Log Message:
-----------
UI drawing fix:

Wrongly replaced a "&" with "|" for a define. That made node headers in node editor
draw too dark. Also made header for default node not use alpha.

In general this drawing is not very good - it gets too transparent and dark.
Needs nicer AA function in interface, will be done later.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_draw.c
    trunk/blender/source/blender/editors/space_node/node_draw.c

Modified: trunk/blender/source/blender/editors/interface/interface_draw.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_draw.c	2013-04-19 14:47:11 UTC (rev 56169)
+++ trunk/blender/source/blender/editors/interface/interface_draw.c	2013-04-19 15:02:37 UTC (rev 56170)
@@ -390,7 +390,7 @@
 /* (old, used in outliner) plain antialiased filled box */
 void uiRoundBox(float minx, float miny, float maxx, float maxy, float rad)
 {
-	ui_draw_anti_roundbox(GL_POLYGON, minx, miny, maxx, maxy, rad, roundboxtype | UI_RB_ALPHA);
+	ui_draw_anti_roundbox(GL_POLYGON, minx, miny, maxx, maxy, rad, roundboxtype & UI_RB_ALPHA);
 }
 
 /* ************** SPECIAL BUTTON DRAWING FUNCTIONS ************* */

Modified: trunk/blender/source/blender/editors/space_node/node_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_draw.c	2013-04-19 14:47:11 UTC (rev 56169)
+++ trunk/blender/source/blender/editors/space_node/node_draw.c	2013-04-19 15:02:37 UTC (rev 56170)
@@ -775,9 +775,12 @@
 	/* shadow */
 	node_draw_shadow(snode, node, BASIS_RAD, 1.0f);
 	
-	/* header */
-	if (color_id == TH_NODE)
-		UI_ThemeColorShade(color_id, -20);
+	/* header uses color from backdrop, but we make it opaqie */
+	if (color_id == TH_NODE) {
+		float col[3];
+		UI_GetThemeColorShade3fv(color_id, -20, col);
+		glColor4f(col[0], col[1], col[2], 1.0f);
+	}
 	else
 		UI_ThemeColor(color_id);