[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50538] trunk/blender/source/blender: code cleanup: use an enum for uiBut->pointype ( more useful debug display of members),
Campbell Barton
ideasman42 at gmail.com
Wed Sep 12 01:10:24 CEST 2012
Revision: 50538
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50538
Author: campbellbarton
Date: 2012-09-11 23:10:23 +0000 (Tue, 11 Sep 2012)
Log Message:
-----------
code cleanup: use an enum for uiBut->pointype (more useful debug display of members),
and rename COL -> COLOR --- less confusing since the layout engine has row/col's.
Modified Paths:
--------------
trunk/blender/source/blender/bmesh/operators/bmo_connect.c
trunk/blender/source/blender/editors/include/UI_interface.h
trunk/blender/source/blender/editors/interface/interface.c
trunk/blender/source/blender/editors/interface/interface_handlers.c
trunk/blender/source/blender/editors/interface/interface_intern.h
trunk/blender/source/blender/editors/interface/interface_regions.c
trunk/blender/source/blender/editors/interface/interface_utils.c
trunk/blender/source/blender/editors/interface/interface_widgets.c
trunk/blender/source/blender/editors/space_node/drawnode.c
Modified: trunk/blender/source/blender/bmesh/operators/bmo_connect.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_connect.c 2012-09-11 22:55:27 UTC (rev 50537)
+++ trunk/blender/source/blender/bmesh/operators/bmo_connect.c 2012-09-11 23:10:23 UTC (rev 50538)
@@ -339,7 +339,6 @@
goto cleanup;
}
- j = 0;
if (vv1[0] == vv1[lenv1 - 1]) {
lenv1--;
}
Modified: trunk/blender/source/blender/editors/include/UI_interface.h
===================================================================
--- trunk/blender/source/blender/editors/include/UI_interface.h 2012-09-11 22:55:27 UTC (rev 50537)
+++ trunk/blender/source/blender/editors/include/UI_interface.h 2012-09-11 23:10:23 UTC (rev 50538)
@@ -187,14 +187,15 @@
* - bit 8: for 'bit'
* - bit 9-15: button type (now 6 bits, 64 types)
* */
+typedef enum {
+ CHA = 32,
+ SHO = 64,
+ INT = 96,
+ FLO = 128,
+/* FUN = 192, */ /*UNUSED*/
+ BIT = 256
+} eButPointerType;
-#define CHA 32
-#define SHO 64
-#define INT 96
-#define FLO 128
-/*#define FUN 192*/ /*UNUSED*/
-#define BIT 256
-
/* button reqyires a pointer */
#define BUTPOIN (FLO | SHO | CHA)
@@ -214,7 +215,7 @@
ICONROW = (12 << 9),
ICONTOG = (13 << 9),
NUMSLI = (14 << 9),
- COL = (15 << 9),
+ COLOR = (15 << 9),
IDPOIN = (16 << 9),
HSVSLI = (17 << 9),
SCROLL = (18 << 9),
Modified: trunk/blender/source/blender/editors/interface/interface.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface.c 2012-09-11 22:55:27 UTC (rev 50537)
+++ trunk/blender/source/blender/editors/interface/interface.c 2012-09-11 23:10:23 UTC (rev 50538)
@@ -1149,7 +1149,7 @@
if (*value == (double)but->hardmax) is_push = 1;
}
break;
- case COL:
+ case COLOR:
is_push = 2;
break;
default:
Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c 2012-09-11 22:55:27 UTC (rev 50537)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c 2012-09-11 23:10:23 UTC (rev 50538)
@@ -1049,7 +1049,7 @@
case PULLDOWN:
ui_apply_but_BLOCK(C, but, data);
break;
- case COL:
+ case COLOR:
if (data->cancel)
ui_apply_but_VEC(C, but, data);
else
@@ -1180,7 +1180,7 @@
}
/* RGB triple */
- else if (but->type == COL) {
+ else if (but->type == COLOR) {
float rgb[3];
if (but->poin == NULL && but->rnapoin.data == NULL) ;
@@ -2092,12 +2092,12 @@
menufunc = ui_block_func_ICONTEXTROW;
arg = but;
break;
- case COL:
+ case COLOR:
ui_get_but_vectorf(but, data->origvec);
copy_v3_v3(data->vec, data->origvec);
but->editvec = data->vec;
- handlefunc = ui_block_func_COL;
+ handlefunc = ui_block_func_COLOR;
arg = but;
break;
@@ -3001,7 +3001,7 @@
return WM_UI_HANDLER_BREAK;
}
}
- else if (but->type == COL) {
+ else if (but->type == COLOR) {
if (ELEM(event->type, WHEELDOWNMOUSE, WHEELUPMOUSE) && event->alt) {
float *hsv = ui_block_hsv_get(but->block);
float col[3];
@@ -4908,7 +4908,7 @@
case BUTM:
retval = ui_do_but_BUT(C, but, data, event);
break;
- case COL:
+ case COLOR:
if (but->a1 == UI_GRAD_V_ALT) /* signal to prevent calling up color picker */
retval = ui_do_but_EXIT(C, but, data, event);
else
@@ -5874,7 +5874,7 @@
}
}
- if (but->type != COL) { /* exception */
+ if (but->type != COLOR) { /* exception */
data->cancel = TRUE;
}
button_activate_state(C, but, BUTTON_STATE_EXIT);
@@ -5984,7 +5984,7 @@
/* copy over return values from the closing menu */
if ((menu->menuretval & UI_RETURN_OK) || (menu->menuretval & UI_RETURN_UPDATE)) {
- if (but->type == COL)
+ if (but->type == COLOR)
copy_v3_v3(data->vec, menu->retvec);
else if (ELEM3(but->type, MENU, ICONROW, ICONTEXTROW))
data->value = menu->retvalue;
Modified: trunk/blender/source/blender/editors/interface/interface_intern.h
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_intern.h 2012-09-11 22:55:27 UTC (rev 50537)
+++ trunk/blender/source/blender/editors/interface/interface_intern.h 2012-09-11 23:10:23 UTC (rev 50538)
@@ -94,8 +94,7 @@
UI_WTYPE_BOX,
UI_WTYPE_SCROLL,
UI_WTYPE_LISTITEM,
- UI_WTYPE_PROGRESSBAR,
-
+ UI_WTYPE_PROGRESSBAR
} uiWidgetTypeEnum;
/* panel limits */
@@ -133,7 +132,7 @@
/* bit button defines */
/* Bit operations */
-#define UI_BITBUT_TEST(a, b) ( ( (a) & 1 << (b) ) != 0)
+#define UI_BITBUT_TEST(a, b) ( ( (a) & 1 << (b) ) != 0)
#define UI_BITBUT_SET(a, b) ( (a) | 1 << (b) )
#define UI_BITBUT_CLR(a, b) ( (a) & ~(1 << (b)) )
/* bit-row */
@@ -159,8 +158,9 @@
struct uiBut {
struct uiBut *next, *prev;
int flag, drawflag;
- eButType type;
- short pointype, bit, bitnr, retval, strwidth, ofs, pos, selsta, selend, alignnr;
+ eButType type;
+ eButPointerType pointype;
+ short bit, bitnr, retval, strwidth, ofs, pos, selsta, selend, alignnr;
char *str;
char strdata[UI_MAX_NAME_STR];
@@ -421,7 +421,7 @@
float retvec[4];
};
-uiBlock *ui_block_func_COL(struct bContext *C, uiPopupBlockHandle *handle, void *arg_but);
+uiBlock *ui_block_func_COLOR(struct bContext *C, uiPopupBlockHandle *handle, void *arg_but);
void ui_block_func_ICONROW(struct bContext *C, uiLayout *layout, void *arg_but);
void ui_block_func_ICONTEXTROW(struct bContext *C, uiLayout *layout, void *arg_but);
Modified: trunk/blender/source/blender/editors/interface/interface_regions.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_regions.c 2012-09-11 22:55:27 UTC (rev 50537)
+++ trunk/blender/source/blender/editors/interface/interface_regions.c 2012-09-11 23:10:23 UTC (rev 50538)
@@ -2237,7 +2237,7 @@
return 0;
}
-uiBlock *ui_block_func_COL(bContext *C, uiPopupBlockHandle *handle, void *arg_but)
+uiBlock *ui_block_func_COLOR(bContext *C, uiPopupBlockHandle *handle, void *arg_but)
{
uiBut *but = arg_but;
uiBlock *block;
Modified: trunk/blender/source/blender/editors/interface/interface_utils.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_utils.c 2012-09-11 22:55:27 UTC (rev 50537)
+++ trunk/blender/source/blender/editors/interface/interface_utils.c 2012-09-11 23:10:23 UTC (rev 50538)
@@ -78,7 +78,7 @@
if (arraylen && index == -1) {
if (ELEM(RNA_property_subtype(prop), PROP_COLOR, PROP_COLOR_GAMMA))
- but = uiDefButR_prop(block, COL, 0, name, x1, y1, x2, y2, ptr, prop, 0, 0, 0, -1, -1, NULL);
+ but = uiDefButR_prop(block, COLOR, 0, name, x1, y1, x2, y2, ptr, prop, 0, 0, 0, -1, -1, NULL);
}
else if (RNA_property_subtype(prop) == PROP_PERCENTAGE || RNA_property_subtype(prop) == PROP_FACTOR)
but = uiDefButR_prop(block, NUMSLI, 0, name, x1, y1, x2, y2, ptr, prop, index, 0, 0, -1, -1, NULL);
Modified: trunk/blender/source/blender/editors/interface/interface_widgets.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_widgets.c 2012-09-11 22:55:27 UTC (rev 50537)
+++ trunk/blender/source/blender/editors/interface/interface_widgets.c 2012-09-11 23:10:23 UTC (rev 50538)
@@ -3154,7 +3154,7 @@
wt = widget_type(UI_WTYPE_MENU_ITEM);
break;
- case COL:
+ case COLOR:
wt = widget_type(UI_WTYPE_SWATCH);
break;
Modified: trunk/blender/source/blender/editors/space_node/drawnode.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/drawnode.c 2012-09-11 22:55:27 UTC (rev 50537)
+++ trunk/blender/source/blender/editors/space_node/drawnode.c 2012-09-11 23:10:23 UTC (rev 50538)
@@ -171,7 +171,7 @@
int labelw = width - 40;
RNA_pointer_create(&ntree->id, &RNA_NodeSocket, sock, &ptr);
- bt = uiDefButR(block, COL, B_NODE_EXEC, "",
+ bt = uiDefButR(block, COLOR, B_NODE_EXEC, "",
x, y + 2, (labelw > 0 ? 40 : width), NODE_DY - 2,
&ptr, "default_value", 0, 0, 0, -1, -1, NULL);
if (node)
More information about the Bf-blender-cvs
mailing list