diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-06-20 23:23:12 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-06-20 23:23:12 +0400 |
commit | cf129d8cb5e5f03e613af8ad9174a004d7d34b01 (patch) | |
tree | 8be889ea4b26ccd726c05e5871fdf043e86ae7b0 | |
parent | 850d73414716351421245102f4d2255691987b8a (diff) |
avoid calls to BLF_height_default in a loop calling with the same value, also quiet warning.
-rw-r--r-- | source/blender/editors/interface/view2d.c | 7 | ||||
-rw-r--r-- | source/blender/editors/space_sequencer/sequencer_ops.c | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c index b2227405d8b..51e1b30f0bf 100644 --- a/source/blender/editors/interface/view2d.c +++ b/source/blender/editors/interface/view2d.c @@ -2078,18 +2078,21 @@ void UI_view2d_text_cache_draw(ARegion *ar) { View2DString *v2s; int col_pack_prev = 0; + + /* investigate using BLF_ascender() */ + const float default_height = strings.first ? BLF_height_default("28") : 0.0f; // glMatrixMode(GL_PROJECTION); // glPushMatrix(); // glMatrixMode(GL_MODELVIEW); // glPushMatrix(); ED_region_pixelspace(ar); - + for (v2s = strings.first; v2s; v2s = v2s->next) { const char *str = (const char *)(v2s + 1); int xofs = 0, yofs; - yofs = ceil(0.5f * (v2s->rect.ymax - v2s->rect.ymin - BLF_height_default("28"))); + yofs = ceil(0.5f * (v2s->rect.ymax - v2s->rect.ymin - default_height)); if (yofs < 1) yofs = 1; if (col_pack_prev != v2s->col.pack) { diff --git a/source/blender/editors/space_sequencer/sequencer_ops.c b/source/blender/editors/space_sequencer/sequencer_ops.c index 685358393cf..4a1c8f0c006 100644 --- a/source/blender/editors/space_sequencer/sequencer_ops.c +++ b/source/blender/editors/space_sequencer/sequencer_ops.c @@ -324,7 +324,6 @@ void sequencer_keymap(wmKeyConfig *keyconf) void ED_operatormacros_sequencer(void) { wmOperatorType *ot; - wmOperatorTypeMacro *otmacro; ot = WM_operatortype_append_macro("SEQUENCER_OT_duplicate_move", "Duplicate Strips", "Duplicate selected strips and move them", OPTYPE_UNDO | OPTYPE_REGISTER); |