diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-12-13 09:43:01 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-12-13 09:43:01 +0400 |
| commit | e036c90253cc0afafef6bf8a2e85158d934ba5c8 (patch) | |
| tree | 46b6f157ab9c51a5b3ed35b151a92ba6c9412275 /source | |
| parent | 1ab6306177d303165c3e80d4056a47ce6e74ac41 (diff) | |
region overlap feature missed view3d grid-scale text, increase string size for title text too.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_draw.c | 3 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_window.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index 1b0b0f027d9..c9387bd776d 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -3234,7 +3234,8 @@ static void view3d_main_area_draw_info(const bContext *C, ARegion *ar, const cha BLI_snprintf(numstr, sizeof(numstr), "%s x %.4g", grid_unit, v3d->grid); } - BLF_draw_default_ascii(U.widget_unit, ar->winy - (USER_SHOW_VIEWPORTNAME ? 2 * U.widget_unit : U.widget_unit), 0.0f, + BLF_draw_default_ascii(draw_name_offset(ar) + U.widget_unit, + ar->winy - (USER_SHOW_VIEWPORTNAME ? 2 * U.widget_unit : U.widget_unit), 0.0f, numstr[0] ? numstr : grid_unit, sizeof(numstr)); } } diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index 4dd7559c2cf..226f4f2aa60 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -309,7 +309,7 @@ void wm_window_title(wmWindowManager *wm, wmWindow *win) /* this is set to 1 if you don't have startup.blend open */ if (G.save_over && G.main->name[0]) { - char str[sizeof(G.main->name) + 12]; + char str[sizeof(G.main->name) + 24]; BLI_snprintf(str, sizeof(str), "Blender%s [%s%s]", wm->file_saved ? "" : "*", G.main->name, G.main->recovered ? " (Recovered)" : ""); GHOST_SetTitle(win->ghostwin, str); |