[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50582] trunk/blender/source/blender/ editors: code cleanup: correct misleading use of LABEL button type.

[Campbell Barton]

Revision: 50582
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50582
Author:   campbellbarton
Date:     2012-09-14 05:44:47 +0000 (Fri, 14 Sep 2012)
Log Message:
-----------
code cleanup: correct misleading use of LABEL button type.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/include/UI_interface.h
    trunk/blender/source/blender/editors/interface/interface.c
    trunk/blender/source/blender/editors/space_node/drawnode.c

Modified: trunk/blender/source/blender/editors/include/UI_interface.h
===================================================================
--- trunk/blender/source/blender/editors/include/UI_interface.h	2012-09-14 05:08:48 UTC (rev 50581)
+++ trunk/blender/source/blender/editors/include/UI_interface.h	2012-09-14 05:44:47 UTC (rev 50582)
@@ -196,7 +196,7 @@
 	UI_BUT_POIN_BIT = 256  /* OR'd with a bit index*/
 } eButPointerType;
 
-/* button requires a pointer */
+/* requires (but->poin != NULL) */
 #define UI_BUT_POIN_TYPES (UI_BUT_POIN_FLOAT | UI_BUT_POIN_SHORT | UI_BUT_POIN_CHAR)
 
 /* assigned to but->type, OR'd with the flags above when passing args */

Modified: trunk/blender/source/blender/editors/interface/interface.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface.c	2012-09-14 05:08:48 UTC (rev 50581)
+++ trunk/blender/source/blender/editors/interface/interface.c	2012-09-14 05:44:47 UTC (rev 50582)
@@ -2592,10 +2592,17 @@
 {
 	uiBut *but;
 	int slen;
-	
-	if (type & UI_BUT_POIN_TYPES) {       /* a pointer is required */
-		if (poin == NULL)
+
+	/* we could do some more error checks here */
+	if ((type & BUTTYPE) == LABEL) {
+		BLI_assert((poin != NULL || a1 != 0.0f || a2 != 0.0f || min != 0.0f || max != 0.0f) == FALSE);
+	}
+
+	if (type & UI_BUT_POIN_TYPES) {  /* a pointer is required */
+		if (poin == NULL) {
+			BLI_assert(0);
 			return NULL;
+		}
 	}
 
 	but = MEM_callocN(sizeof(uiBut), "uiBut");

Modified: trunk/blender/source/blender/editors/space_node/drawnode.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/drawnode.c	2012-09-14 05:08:48 UTC (rev 50581)
+++ trunk/blender/source/blender/editors/space_node/drawnode.c	2012-09-14 05:44:47 UTC (rev 50582)
@@ -647,23 +647,22 @@
 static void draw_group_socket_name(SpaceNode *snode, bNode *gnode, bNodeSocket *sock,
                                    int in_out, float xoffset, float yoffset)
 {
-	bNodeTree *ngroup = (bNodeTree *)gnode->id;
-	uiBut *bt;
-	const char *ui_name = IFACE_(sock->name);
-	
 	if (sock->flag & SOCK_DYNAMIC) {
-		bt = uiDefBut(gnode->block, TEX, 0, "", 
-		              sock->locx + xoffset, sock->locy + 1 + yoffset, 72, NODE_DY,
-		              sock->name, 0, sizeof(sock->name), 0, 0, "");
+		bNodeTree *ngroup = (bNodeTree *)gnode->id;
+		uiBut *but;
+		but = uiDefBut(gnode->block, TEX, 0, "",
+		               sock->locx + xoffset, sock->locy + 1 + yoffset, 72, NODE_DY,
+		               sock->name, 0, sizeof(sock->name), 0, 0, "");
 		if (in_out == SOCK_IN)
-			uiButSetFunc(bt, update_group_input_cb, snode, ngroup);
+			uiButSetFunc(but, update_group_input_cb, snode, ngroup);
 		else
-			uiButSetFunc(bt, update_group_output_cb, snode, ngroup);
+			uiButSetFunc(but, update_group_output_cb, snode, ngroup);
 	}
 	else {
+		const char *ui_name = IFACE_(sock->name);
 		uiDefBut(gnode->block, LABEL, 0, ui_name,
 		         sock->locx + xoffset, sock->locy + 1 + yoffset, 72, NODE_DY,
-		         NULL, 0, sizeof(ui_name), 0, 0, "");
+		         NULL, 0, 0, 0, 0, "");
 	}
 }