diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-06-29 14:09:15 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-06-29 14:09:15 +0400 |
| commit | 32d5b52f593cb526b2649d82bd674ff67b3ff09e (patch) | |
| tree | f10a1bdaa9bed9a9e6334fb1745f0c69f92e5d13 /source/blender/editors | |
| parent | b70c844c5fc2e89e57b04c83de45ab8ba2daffce (diff) | |
re-arrange '--help' output into more useful sections (added debug, python).
also minor style cleanup
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/animation/fmodifier_ui.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/object/object_vgroup.c | 3 | ||||
| -rw-r--r-- | source/blender/editors/screen/screen_edit.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_draw.c | 4 |
4 files changed, 6 insertions, 5 deletions
diff --git a/source/blender/editors/animation/fmodifier_ui.c b/source/blender/editors/animation/fmodifier_ui.c index b98e4e493ff..adea3bcdc31 100644 --- a/source/blender/editors/animation/fmodifier_ui.c +++ b/source/blender/editors/animation/fmodifier_ui.c @@ -138,7 +138,7 @@ static void draw_modifier__generator(uiLayout *layout, ID *id, FModifier *fcm, s /* draw polynomial order selector */ row = uiLayoutRow(layout, FALSE); block = uiLayoutGetBlock(row); - but = uiDefButI(block, NUM, B_FMODIFIER_REDRAW, IFACE_("Poly Order:"), 0.5*UI_UNIT_X, 0, bwidth, UI_UNIT_Y, + but = uiDefButI(block, NUM, B_FMODIFIER_REDRAW, IFACE_("Poly Order:"), 0.5f * UI_UNIT_X, 0, bwidth, UI_UNIT_Y, &data->poly_order, 1, 100, 0, 0, TIP_("'Order' of the Polynomial (for a polynomial with n terms, 'order' is n-1)")); uiButSetFunc(but, validate_fmodifier_cb, fcm, NULL); diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index 14829569c25..e1a18158c2d 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -2982,7 +2982,8 @@ static int vertex_group_vert_select_unlocked_poll(bContext *C) return 0; if (!(vgroup_object_in_edit_mode(ob) || - vgroup_object_in_wpaint_vert_select(ob))) { + vgroup_object_in_wpaint_vert_select(ob))) + { return 0; } diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index c274135786f..d9dc5648ae3 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -1639,7 +1639,7 @@ void ED_screen_full_restore(bContext *C, ScrArea *sa) if (sl->spacetype == SPACE_IMAGE) { SpaceImage *sima = sa->spacedata.first; - if(sima->flag & (SI_PREVSPACE|SI_FULLWINDOW)) { + if (sima->flag & (SI_PREVSPACE | SI_FULLWINDOW)) { sima->flag &= ~SI_PREVSPACE; sima->flag &= ~SI_FULLWINDOW; ED_screen_full_prevspace(C, sa); diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index 46feea6a553..3b769761dfb 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -1059,9 +1059,9 @@ static void outliner_buttons(const bContext *C, uiBlock *block, ARegion *ar, Spa dx = (int)UI_GetStringWidth(te->name); - if (dx < 5*UI_UNIT_X) dx = 5*UI_UNIT_X; + if (dx < 5 * UI_UNIT_X) dx = 5 * UI_UNIT_X; spx = te->xs + 1.8f * UI_UNIT_X; - if (spx + dx + 0.5f*UI_UNIT_X > ar->v2d.cur.xmax) dx = ar->v2d.cur.xmax - spx - 0.5f*UI_UNIT_X; + if (spx + dx + 0.5f * UI_UNIT_X > ar->v2d.cur.xmax) dx = ar->v2d.cur.xmax - spx - 0.5f * UI_UNIT_X; bt = uiDefBut(block, TEX, OL_NAMEBUTTON, "", spx, (int)te->ys, dx + UI_UNIT_X, UI_UNIT_Y - 1, (void *)te->name, 1.0, (float)len, 0, 0, ""); |