[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60601] trunk/blender/source/blender/ editors: uiSetRoundBox still took hard coded numbers in places.

Campbell Barton ideasman42 at gmail.com
Tue Oct 8 13:23:15 CEST 2013


Revision: 60601
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60601
Author:   campbellbarton
Date:     2013-10-08 11:23:14 +0000 (Tue, 08 Oct 2013)
Log Message:
-----------
uiSetRoundBox still took hard coded numbers in places.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/interface/interface_draw.c
    trunk/blender/source/blender/editors/space_node/drawnode.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-10-08 10:52:33 UTC (rev 60600)
+++ trunk/blender/source/blender/editors/interface/interface_draw.c	2013-10-08 11:23:14 UTC (rev 60601)
@@ -1389,7 +1389,7 @@
 
 	if (scopes->track_disabled) {
 		glColor4f(0.7f, 0.3f, 0.3f, 0.3f);
-		uiSetRoundBox(15);
+		uiSetRoundBox(UI_CNR_ALL);
 		uiDrawBox(GL_POLYGON, rect.xmin - 1, rect.ymin, rect.xmax + 1, rect.ymax + 1, 3.0f);
 
 		ok = 1;
@@ -1437,7 +1437,7 @@
 
 			if (scopes->use_track_mask) {
 				glColor4f(0.0f, 0.0f, 0.0f, 0.3f);
-				uiSetRoundBox(15);
+				uiSetRoundBox(UI_CNR_ALL);
 				uiDrawBox(GL_POLYGON, rect.xmin - 1, rect.ymin, rect.xmax + 1, rect.ymax + 1, 3.0f);
 			}
 
@@ -1478,7 +1478,7 @@
 
 	if (!ok) {
 		glColor4f(0.f, 0.f, 0.f, 0.3f);
-		uiSetRoundBox(15);
+		uiSetRoundBox(UI_CNR_ALL);
 		uiDrawBox(GL_POLYGON, rect.xmin - 1, rect.ymin, rect.xmax + 1, rect.ymax + 1, 3.0f);
 	}
 

Modified: trunk/blender/source/blender/editors/space_node/drawnode.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/drawnode.c	2013-10-08 10:52:33 UTC (rev 60600)
+++ trunk/blender/source/blender/editors/space_node/drawnode.c	2013-10-08 11:23:14 UTC (rev 60601)
@@ -571,7 +571,7 @@
 	 */
 #if 0
 	/* body */
-	uiSetRoundBox(15);
+	uiSetRoundBox(UI_CNR_ALL);
 	UI_ThemeColor4(TH_NODE);
 	glEnable(GL_BLEND);
 	uiRoundBox(rct->xmin, rct->ymin, rct->xmax, rct->ymax, size);

Modified: trunk/blender/source/blender/editors/space_node/node_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_draw.c	2013-10-08 10:52:33 UTC (rev 60600)
+++ trunk/blender/source/blender/editors/space_node/node_draw.c	2013-10-08 11:23:14 UTC (rev 60601)
@@ -1241,7 +1241,7 @@
 	/* shade node groups to separate them visually */
 	UI_ThemeColorShadeAlpha(TH_NODE_GROUP, 0, -70);
 	glEnable(GL_BLEND);
-	uiSetRoundBox(0);
+	uiSetRoundBox(UI_CNR_NONE);
 	uiDrawBox(GL_POLYGON, rect.xmin, rect.ymin, rect.xmax, rect.ymax, 0);
 	glDisable(GL_BLEND);
 	




More information about the Bf-blender-cvs mailing list