diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-05-08 16:53:14 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-05-08 16:53:14 +0400 |
| commit | cf3d638681f18696c5e17727f4533ec37b9f7253 (patch) | |
| tree | b86146210ddbb8ee270dec2ac0d80307412e5e68 /source/blender | |
| parent | 34c28e3a0e81598976a501e03a9cbb51d54c79b7 (diff) | |
remove unneeded null check in draw_viewport_name
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/intern/text.c | 3 | ||||
| -rw-r--r-- | source/blender/editors/space_view3d/view3d_draw.c | 8 |
2 files changed, 3 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c index c5a509162ff..470de8a205d 100644 --- a/source/blender/blenkernel/intern/text.c +++ b/source/blender/blenkernel/intern/text.c @@ -1148,9 +1148,6 @@ static void txt_pop_last(Text *text) txt_pop_sel(text); } -/* never used: CVS 1.19 */ -/* static void txt_pop_selr (Text *text) */ - void txt_pop_sel(Text *text) { text->sell = text->curl; diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c index f24a59d01a7..27d555a749d 100644 --- a/source/blender/editors/space_view3d/view3d_draw.c +++ b/source/blender/editors/space_view3d/view3d_draw.c @@ -863,14 +863,12 @@ static void draw_viewport_name(ARegion *ar, View3D *v3d, rcti *rect) name = tmpstr; } - if (name) { - UI_ThemeColor(TH_TEXT_HI); + UI_ThemeColor(TH_TEXT_HI); #ifdef WITH_INTERNATIONAL - BLF_draw_default(U.widget_unit + rect->xmin, rect->ymax - U.widget_unit, 0.0f, name, sizeof(tmpstr)); + BLF_draw_default(U.widget_unit + rect->xmin, rect->ymax - U.widget_unit, 0.0f, name, sizeof(tmpstr)); #else - BLF_draw_default_ascii(U.widget_unit + rect->xmin, rect->ymax - U.widget_unit, 0.0f, name, sizeof(tmpstr)); + BLF_draw_default_ascii(U.widget_unit + rect->xmin, rect->ymax - U.widget_unit, 0.0f, name, sizeof(tmpstr)); #endif - } } /* draw info beside axes in bottom left-corner: |