[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50006] trunk/blender/source/blender/ editors/interface: style cleanup
Campbell Barton
ideasman42 at gmail.com
Sun Aug 19 12:41:27 CEST 2012
Revision: 50006
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50006
Author: campbellbarton
Date: 2012-08-19 10:41:27 +0000 (Sun, 19 Aug 2012)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/source/blender/editors/interface/interface.c
trunk/blender/source/blender/editors/interface/interface_draw.c
trunk/blender/source/blender/editors/interface/interface_handlers.c
trunk/blender/source/blender/editors/interface/interface_icons.c
trunk/blender/source/blender/editors/interface/interface_layout.c
trunk/blender/source/blender/editors/interface/interface_ops.c
trunk/blender/source/blender/editors/interface/interface_panel.c
trunk/blender/source/blender/editors/interface/interface_regions.c
trunk/blender/source/blender/editors/interface/interface_templates.c
trunk/blender/source/blender/editors/interface/interface_widgets.c
Modified: trunk/blender/source/blender/editors/interface/interface.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface.c 2012-08-19 10:41:16 UTC (rev 50005)
+++ trunk/blender/source/blender/editors/interface/interface.c 2012-08-19 10:41:27 UTC (rev 50006)
@@ -238,7 +238,7 @@
bt->rect.xmax = maxf(bt->rect.xmax, offset + block->minbounds);
}
- ui_check_but(bt); // clips text again
+ ui_check_but(bt); /* clips text again */
if (nextcol)
x1addval += i + block->bounds;
@@ -993,7 +993,7 @@
/* uses local copy of style, to scale things down, and allow widgets to change stuff */
void uiDrawBlock(const bContext *C, uiBlock *block)
{
- uiStyle style = *UI_GetStyle(); // XXX pass on as arg
+ uiStyle style = *UI_GetStyle(); /* XXX pass on as arg */
ARegion *ar;
uiBut *but;
rcti rect;
@@ -1352,7 +1352,7 @@
if (unit_type == PROP_UNIT_NONE)
return 0;
-#if 1 // removed so angle buttons get correct snapping
+#if 1 /* removed so angle buttons get correct snapping */
if (unit->system_rotation == USER_UNIT_ROT_RADIANS && unit_type == PROP_UNIT_ROTATION)
return 0;
#endif
@@ -2095,7 +2095,7 @@
block = MEM_callocN(sizeof(uiBlock), "uiBlock");
block->active = 1;
block->dt = dt;
- block->evil_C = (void *)C; // XXX
+ block->evil_C = (void *)C; /* XXX */
if (scn) {
block->color_profile = (scn->r.color_mgt_flag & R_COLOR_MANAGEMENT);
@@ -2365,7 +2365,7 @@
void uiBlockEndAlign(uiBlock *block)
{
- block->flag &= ~UI_BUT_ALIGN; // all 4 flags
+ block->flag &= ~UI_BUT_ALIGN; /* all 4 flags */
}
int ui_but_can_align(uiBut *but)
@@ -2588,8 +2588,8 @@
but->lockstr = block->lockstr;
but->dt = block->dt;
- but->aspect = 1.0f; //XXX block->aspect;
- but->block = block; // pointer back, used for frontbuffer status, and picker
+ but->aspect = 1.0f; /* XXX block->aspect; */
+ but->block = block; /* pointer back, used for frontbuffer status, and picker */
if ((block->flag & UI_BUT_ALIGN) && ui_but_can_align(but))
but->alignnr = block->alignnr;
Modified: trunk/blender/source/blender/editors/interface/interface_draw.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_draw.c 2012-08-19 10:41:16 UTC (rev 50005)
+++ trunk/blender/source/blender/editors/interface/interface_draw.c 2012-08-19 10:41:27 UTC (rev 50006)
@@ -629,7 +629,7 @@
}
}
-#endif // WITH_INTERNATIONAL
+#endif /* WITH_INTERNATIONAL */
#endif
static void draw_scope_end(rctf *rect, GLint *scissor)
Modified: trunk/blender/source/blender/editors/interface/interface_handlers.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_handlers.c 2012-08-19 10:41:16 UTC (rev 50005)
+++ trunk/blender/source/blender/editors/interface/interface_handlers.c 2012-08-19 10:41:27 UTC (rev 50006)
@@ -4707,7 +4707,6 @@
static int ui_do_button(bContext *C, uiBlock *block, uiBut *but, wmEvent *event)
{
-// Scene *scene= CTX_data_scene(C);
uiHandleButtonData *data;
int retval;
@@ -4874,7 +4873,7 @@
retval = ui_do_but_BUT(C, but, data, event);
break;
case COL:
- if (but->a1 == UI_GRAD_V_ALT) // signal to prevent calling up color picker
+ if (but->a1 == UI_GRAD_V_ALT) /* signal to prevent calling up color picker */
retval = ui_do_but_EXIT(C, but, data, event);
else
retval = ui_do_but_BLOCK(C, but, data, event);
@@ -5280,8 +5279,13 @@
data->wm = CTX_wm_manager(C);
data->window = CTX_wm_window(C);
data->region = ar;
- if (ELEM(but->type, BUT_CURVE, SEARCH_MENU) ) ; // XXX curve is temp
- else data->interactive = 1;
+
+ if (ELEM(but->type, BUT_CURVE, SEARCH_MENU)) {
+ /* XXX curve is temp */
+ }
+ else {
+ data->interactive = 1;
+ }
data->state = BUTTON_STATE_INIT;
Modified: trunk/blender/source/blender/editors/interface/interface_icons.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_icons.c 2012-08-19 10:41:16 UTC (rev 50005)
+++ trunk/blender/source/blender/editors/interface/interface_icons.c 2012-08-19 10:41:27 UTC (rev 50006)
@@ -596,7 +596,7 @@
IMB_freeImBuf(bbuf);
}
-#endif // WITH_HEADLESS
+#endif /* WITH_HEADLESS */
static void init_iconfile_list(struct ListBase *list)
{
Modified: trunk/blender/source/blender/editors/interface/interface_layout.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_layout.c 2012-08-19 10:41:16 UTC (rev 50005)
+++ trunk/blender/source/blender/editors/interface/interface_layout.c 2012-08-19 10:41:27 UTC (rev 50006)
@@ -2749,7 +2749,7 @@
uiBut *but = bitem->but;
BLI_dynstr_appendf(ds, "'type':%d, ", but->type); /* see ~ UI_interface.h:200 */
BLI_dynstr_appendf(ds, "'draw_string':'''%s''', ", but->drawstr);
- BLI_dynstr_appendf(ds, "'tip':'''%s''', ", but->tip ? but->tip : ""); // not exactly needed, rna has this
+ BLI_dynstr_appendf(ds, "'tip':'''%s''', ", but->tip ? but->tip : ""); /* not exactly needed, rna has this */
if (but->optype) {
char *opstr = WM_operator_pystring(but->block->evil_C, but->optype, but->opptr, 0);
@@ -2811,7 +2811,7 @@
ui_intro_items(ds, &layout->items);
}
-static char *str = NULL; // XXX, constant re-freeing, far from ideal.
+static char *str = NULL; /* XXX, constant re-freeing, far from ideal. */
const char *uiLayoutIntrospect(uiLayout *layout)
{
DynStr *ds = BLI_dynstr_new();
@@ -2848,8 +2848,10 @@
/* poll() on this operator may still fail, at the moment there is no nice feedback when this happens
* just fails silently */
if (!WM_operator_repeat_check(C, op)) {
- uiBlockSetButLock(uiLayoutGetBlock(layout), TRUE, "Operator cannot redo");
- uiItemL(layout, IFACE_("* Redo Unsupported *"), ICON_NONE); // XXX, could give some nicer feedback or not show redo panel at all?
+ uiBlockSetButLock(uiLayoutGetBlock(layout), TRUE, "Operator can't' redo");
+
+ /* XXX, could give some nicer feedback or not show redo panel at all? */
+ uiItemL(layout, IFACE_("* Redo Unsupported *"), ICON_NONE);
}
/* menu */
Modified: trunk/blender/source/blender/editors/interface/interface_ops.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_ops.c 2012-08-19 10:41:16 UTC (rev 50005)
+++ trunk/blender/source/blender/editors/interface/interface_ops.c 2012-08-19 10:41:27 UTC (rev 50006)
@@ -1055,7 +1055,7 @@
WM_operatortype_append(UI_OT_copy_data_path_button);
WM_operatortype_append(UI_OT_reset_default_button);
WM_operatortype_append(UI_OT_copy_to_selected_button);
- WM_operatortype_append(UI_OT_reports_to_textblock); // XXX: temp?
+ WM_operatortype_append(UI_OT_reports_to_textblock); /* XXX: temp? */
#ifdef WITH_PYTHON
WM_operatortype_append(UI_OT_editsource);
Modified: trunk/blender/source/blender/editors/interface/interface_panel.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_panel.c 2012-08-19 10:41:16 UTC (rev 50005)
+++ trunk/blender/source/blender/editors/interface/interface_panel.c 2012-08-19 10:41:27 UTC (rev 50006)
@@ -875,11 +875,11 @@
/* consistency; are panels not made, whilst they have tabs */
for (panot = ar->panels.first; panot; panot = panot->next) {
- if ((panot->runtime_flag & PNL_ACTIVE) == 0) { // not made
+ if ((panot->runtime_flag & PNL_ACTIVE) == 0) { /* not made */
for (panew = ar->panels.first; panew; panew = panew->next) {
if ((panew->runtime_flag & PNL_ACTIVE)) {
- if (panew->paneltab == panot) { // panew is tab in notmade pa
+ if (panew->paneltab == panot) { /* panew is tab in notmade pa */
break;
}
}
@@ -893,7 +893,7 @@
}
panot->paneltab = panew;
panew->paneltab = NULL;
- ED_region_tag_redraw(ar); // the buttons panew were not made
+ ED_region_tag_redraw(ar); /* the buttons panew were not made */
}
}
}
@@ -1045,10 +1045,10 @@
}
if (button) {
- if (button == 2) { // close
+ if (button == 2) { /* close */
ED_region_tag_redraw(ar);
}
- else { // collapse
+ else { /* collapse */
if (block->panel->flag & PNL_CLOSED) {
block->panel->flag &= ~PNL_CLOSED;
/* snap back up so full panel aligns with screen edge */
@@ -1106,7 +1106,7 @@
if (!pa || pa->paneltab != NULL)
continue;
- if (pa->type && pa->type->flag & PNL_NO_HEADER) // XXX - accessed freed panels when scripts reload, need to fix.
+ if (pa->type && pa->type->flag & PNL_NO_HEADER) /* XXX - accessed freed panels when scripts reload, need to fix. */
continue;
if (block->rect.xmin <= mx && block->rect.xmax >= mx)
@@ -1177,7 +1177,7 @@
#endif
}
else if (event->type == PADPLUSKEY || event->type == PADMINUS) {
-#if 0 // XXX make float panel exception?
+#if 0 /* XXX make float panel exception? */
int zoom = 0;
/* if panel is closed, only zoom if mouse is over the header */
@@ -1275,7 +1275,7 @@
* Aligorith, 2009Sep
*/
//test_add_new_tabs(ar); // also copies locations of tabs in dragged panel
- check_panel_overlap(ar, NULL); // clears
+ check_panel_overlap(ar, NULL); /* clears */
}
pa->flag &= ~PNL_SELECT;
Modified: trunk/blender/source/blender/editors/interface/interface_regions.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_regions.c 2012-08-19 10:41:16 UTC (rev 50005)
+++ trunk/blender/source/blender/editors/interface/interface_regions.c 2012-08-19 10:41:27 UTC (rev 50006)
@@ -1431,7 +1431,7 @@
yof = butrct.ymax - block->rect.ymin;
if (dir2 == UI_RIGHT) xof = butrct.xmax - block->rect.xmax;
else xof = butrct.xmin - block->rect.xmin;
- // changed direction?
+ /* changed direction? */
if ((dir1 & block->direction) == 0) {
if (block->direction & UI_SHIFT_FLIPPED)
xof += dir2 == UI_LEFT ? 25 : -25;
@@ -1442,7 +1442,7 @@
yof = butrct.ymin - block->rect.ymax;
if (dir2 == UI_RIGHT) xof = butrct.xmax - block->rect.xmax;
else xof = butrct.xmin - block->rect.xmin;
- // changed direction?
+ /* changed direction? */
if ((dir1 & block->direction) == 0) {
if (block->direction & UI_SHIFT_FLIPPED)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list