diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-05-27 23:40:36 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-05-27 23:40:36 +0400 |
commit | b33f0ef0e3c12fcb57217d1653e60aa957b938fc (patch) | |
tree | a8fc31f587031627ca59a1e842ce05f1096e3e6a /source/blender/editors/interface | |
parent | 295aa880e96602885e43993d3604d9c7330b9084 (diff) |
style cleanup
Diffstat (limited to 'source/blender/editors/interface')
6 files changed, 19 insertions, 19 deletions
diff --git a/source/blender/editors/interface/interface_panel.c b/source/blender/editors/interface/interface_panel.c index cbe44505263..e2dbb06fa2f 100644 --- a/source/blender/editors/interface/interface_panel.c +++ b/source/blender/editors/interface/interface_panel.c @@ -932,7 +932,7 @@ static void check_panel_overlap(ARegion *ar, Panel *panel) { Panel *pa; - /* also called with panel==NULL for clear */ + /* also called with (panel == NULL) for clear */ for (pa = ar->panels.first; pa; pa = pa->next) { pa->flag &= ~PNL_OVERLAP; @@ -1024,7 +1024,7 @@ static void ui_handle_panel_header(const bContext *C, uiBlock *block, int mx, in else if (block->panel->control & UI_PNL_CLOSE) { /* whole of header can be used to collapse panel (except top-right corner) */ if (mx <= block->maxx - 8 - PNL_ICON) button = 2; - //else if (mx <= block->minx+10+2*PNL_ICON+2) button= 1; + //else if (mx <= block->minx + 10 + 2 * PNL_ICON + 2) button = 1; } else if (mx <= block->maxx - PNL_ICON - 12) { button = 1; diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c index b690d1f9dc9..dd6be9141ca 100644 --- a/source/blender/editors/interface/interface_regions.c +++ b/source/blender/editors/interface/interface_regions.c @@ -1304,16 +1304,16 @@ static void ui_block_position(wmWindow *window, ARegion *butregion, uiBut *but, } } - /*aspect= (float)(block->maxx - block->minx + 4);*/ /*UNUSED*/ + /* aspect = (float)(block->maxx - block->minx + 4);*/ /*UNUSED*/ ui_block_to_window_fl(butregion, but->block, &block->minx, &block->miny); ui_block_to_window_fl(butregion, but->block, &block->maxx, &block->maxy); - //block->minx-= 2.0; block->miny-= 2.0; - //block->maxx+= 2.0; block->maxy+= 2.0; + //block->minx -= 2.0; block->miny -= 2.0; + //block->maxx += 2.0; block->maxy += 2.0; xsize = block->maxx - block->minx + 4; // 4 for shadow ysize = block->maxy - block->miny + 4; - /*aspect/= (float)xsize;*/ /*UNUSED*/ + /* aspect /= (float)xsize;*/ /*UNUSED*/ { int left = 0, right = 0, top = 0, down = 0; @@ -2706,7 +2706,7 @@ void uiPupBlockEx(bContext *C, uiBlockCreateFunc func, uiBlockHandleFunc popup_f handle->popup_arg = arg; handle->popup_func = popup_func; handle->cancel_func = cancel_func; - // handle->opcontext= opcontext; + // handle->opcontext = opcontext; UI_add_popup_handlers(C, &window->modalhandlers, handle); WM_event_add_mousemove(C); diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 6d1766c8bf1..59ef0c00283 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -350,7 +350,7 @@ static void template_ID(bContext *C, uiLayout *layout, TemplateID *template, Str idptr = RNA_property_pointer_get(&template->ptr, template->prop); id = idptr.data; idfrom = template->ptr.id.data; - // lb= template->idlb; + // lb = template->idlb; block = uiLayoutGetBlock(layout); uiBlockBeginAlign(block); @@ -2299,7 +2299,7 @@ static void list_item_row(bContext *C, uiLayout *layout, PointerRNA *ptr, Pointe void uiTemplateList(uiLayout *layout, bContext *C, PointerRNA *ptr, const char *propname, PointerRNA *activeptr, const char *activepropname, const char *prop_list, int rows, int maxrows, int listtype) { - //Scene *scene= CTX_data_scene(C); + //Scene *scene = CTX_data_scene(C); PropertyRNA *prop = NULL, *activeprop; PropertyType type, activetype; StructRNA *ptype; diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index 87c2f2dc20b..1a7fc98ef74 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -2245,7 +2245,7 @@ void ui_draw_link_bezier(rcti *rect) if (ui_link_bezier_points(rect, coord_array, LINK_RESOL)) { /* we can reuse the dist variable here to increment the GL curve eval amount*/ - // const float dist= 1.0f/(float)LINK_RESOL; // UNUSED + // const float dist = 1.0f/(float)LINK_RESOL; // UNUSED glEnable(GL_BLEND); glEnable(GL_LINE_SMOOTH); diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index 0d16e0f4dc0..edad33953b9 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -1265,7 +1265,7 @@ void init_userdef_do_versions(void) if (U.undosteps == 0) U.undosteps = 32; for (btheme = U.themes.first; btheme; btheme = btheme->next) { - /* check for alpha==0 is safe, then color was never set */ + /* check for (alpha == 0) is safe, then color was never set */ if (btheme->tv3d.edge_seam[3] == 0) { rgba_char_args_set(btheme->tv3d.edge_seam, 230, 150, 50, 255); } @@ -1290,7 +1290,7 @@ void init_userdef_do_versions(void) bTheme *btheme; /* new space type */ for (btheme = U.themes.first; btheme; btheme = btheme->next) { - /* check for alpha==0 is safe, then color was never set */ + /* check for (alpha == 0) is safe, then color was never set */ if (btheme->ttime.back[3] == 0) { // copied from ui_theme_init_default btheme->ttime = btheme->tv3d; diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c index 1d315e9a5b8..b2227405d8b 100644 --- a/source/blender/editors/interface/view2d.c +++ b/source/blender/editors/interface/view2d.c @@ -272,7 +272,7 @@ void UI_view2d_region_reinit(View2D *v2d, short type, int winx, int winy) v2d->keepzoom = (V2D_KEEPASPECT | V2D_LIMITZOOM | V2D_KEEPZOOM); v2d->minzoom = 0.5f; v2d->maxzoom = 2.0f; - //tot_changed= 1; + //tot_changed = 1; v2d->align = (V2D_ALIGN_NO_NEG_X | V2D_ALIGN_NO_POS_Y); v2d->keeptot = V2D_KEEPTOT_BOUNDS; @@ -428,7 +428,7 @@ void UI_view2d_curRect_validate_resize(View2D *v2d, int resize) if (winx != v2d->oldwinx) do_x = TRUE; if (winy != v2d->oldwiny) do_y = TRUE; - /* curRatio= height / width; */ /* UNUSED */ + /* curRatio = height / width; */ /* UNUSED */ winRatio = winy / winx; /* both sizes change (area/region maximised) */ @@ -442,7 +442,7 @@ void UI_view2d_curRect_validate_resize(View2D *v2d, int resize) else do_x = TRUE; } do_cur = do_x; - /* do_win= do_y; */ /* UNUSED */ + /* do_win = do_y; */ /* UNUSED */ if (do_cur) { if ((v2d->keeptot == V2D_KEEPTOT_STRICT) && (winx != v2d->oldwinx)) { @@ -806,7 +806,7 @@ void UI_view2d_curRect_reset(View2D *v2d) v2d->cur.xmax = (float)width; } else { - /* width is centered around x==0 */ + /* width is centered around (x == 0) */ const float dx = (float)width / 2.0f; v2d->cur.xmin = -dx; @@ -825,7 +825,7 @@ void UI_view2d_curRect_reset(View2D *v2d) v2d->cur.ymax = (float)height; } else { - /* height is centered around y==0 */ + /* height is centered around (y == 0) */ const float dy = (float)height / 2.0f; v2d->cur.ymin = -dy; @@ -869,7 +869,7 @@ void UI_view2d_totRect_set_resize(View2D *v2d, int width, int height, int resize v2d->tot.xmax = (float)width; } else { - /* width is centered around x==0 */ + /* width is centered around (x == 0) */ const float dx = (float)width / 2.0f; v2d->tot.xmin = -dx; @@ -888,7 +888,7 @@ void UI_view2d_totRect_set_resize(View2D *v2d, int width, int height, int resize v2d->tot.ymax = (float)height; } else { - /* height is centered around y==0 */ + /* height is centered around (y == 0) */ const float dy = (float)height / 2.0f; v2d->tot.ymin = -dy; |