diff options
| -rw-r--r-- | source/blender/editors/interface/interface_utils.c | 6 | ||||
| -rw-r--r-- | source/blender/editors/space_info/textview.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/interface/interface_utils.c b/source/blender/editors/interface/interface_utils.c index 261c666c33f..a92226b08ec 100644 --- a/source/blender/editors/interface/interface_utils.c +++ b/source/blender/editors/interface/interface_utils.c @@ -172,16 +172,14 @@ int uiDefAutoButsRNA(uiLayout *layout, PointerRNA *ptr, if (!is_boolean) uiItemL(col, name, ICON_NONE); } - else if (label_align == 'H') { + else { /* (label_align == 'H') */ + BLI_assert(label_align == 'H'); split = uiLayoutSplit(layout, 0.5f, false); col = uiLayoutColumn(split, false); uiItemL(col, (is_boolean) ? "" : name, ICON_NONE); col = uiLayoutColumn(split, false); } - else { - col = NULL; - } /* may meed to add more cases here. * don't override enum flag names */ diff --git a/source/blender/editors/space_info/textview.c b/source/blender/editors/space_info/textview.c index d4d45af6431..879c99c35d5 100644 --- a/source/blender/editors/space_info/textview.c +++ b/source/blender/editors/space_info/textview.c @@ -294,7 +294,9 @@ int textview_draw(TextViewContext *tvc, const int draw, int mval[2], void **mous cdc.lofs = -BLF_descender(mono); /* note, scroll bar must be already subtracted () */ cdc.console_width = (tvc->winx - (CONSOLE_DRAW_MARGIN * 2) ) / cdc.cwidth; - CLAMP(cdc.console_width, 1, INT_MAX); /* avoid divide by zero on small windows */ + /* avoid divide by zero on small windows */ + if (cdc.console_width < 1) + cdc.console_width = 1; cdc.winx = tvc->winx - CONSOLE_DRAW_MARGIN; cdc.ymin = tvc->ymin; cdc.ymax = tvc->ymax; |