sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

avoid calls to BLF_height_default in a loop calling with the same value, also quiet warning.

Browse Source
This commit is contained in:
Campbell Barton 2012-06-20 19:23:12 +00:00
parent 850d734147
commit cf129d8cb5
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/editors/interface/view2d.c
View File

@ -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) {

1
source/blender/editors/space_sequencer/sequencer_ops.c
View File

@ -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);