diff options
| -rw-r--r-- | source/blender/src/drawseq.c | 17 | ||||
| -rw-r--r-- | source/blender/src/editseq.c | 2 |
2 files changed, 10 insertions, 9 deletions
diff --git a/source/blender/src/drawseq.c b/source/blender/src/drawseq.c index 77006353640..bb04440bd0f 100644 --- a/source/blender/src/drawseq.c +++ b/source/blender/src/drawseq.c @@ -916,7 +916,7 @@ static void draw_extra_seqinfo(void) /* CURRENT */ se= give_stripelem(last_seq, (G.scene->r.cfra)); if(se) { - sprintf(str, "Cur: %s", se->name); + sprintf(str, "Cur: %s%s", last_seq->strip->dir, se->name); glRasterPos3f(xco, yco, 0.0); BMF_DrawString(G.font, str); xco += xfac*BMF_GetStringWidth(G.font, str) +10.0*xfac; @@ -934,21 +934,22 @@ static void draw_extra_seqinfo(void) glRasterPos3f(xco, yco, 0.0); BMF_DrawString(G.font, str); xco += xfac*BMF_GetStringWidth(G.font, str) +30.0*xfac; - - /* orig size */ - sprintf(str, "OrigSize: %d x %d", last_seq->strip->orx, last_seq->strip->ory); - glRasterPos3f(xco, yco, 0.0); - BMF_DrawString(G.font, str); - xco += xfac*BMF_GetStringWidth(G.font, str) +30.0*xfac; } } else { /* single image */ if (last_seq->strip) { - sprintf(str, "Single: %s len: %d", last_seq->strip->stripdata->name, last_seq->enddisp-last_seq->startdisp); + sprintf(str, "Single: %s%s len: %d", last_seq->strip->dir, last_seq->strip->stripdata->name, last_seq->enddisp-last_seq->startdisp); glRasterPos3f(xco, yco, 0.0); BMF_DrawString(G.font, str); xco += xfac*BMF_GetStringWidth(G.font, str) +30.0*xfac; } } + /* orig size */ + if(last_seq->strip) { + sprintf(str, "OrigSize: %d x %d", last_seq->strip->orx, last_seq->strip->ory); + glRasterPos3f(xco, yco, 0.0); + BMF_DrawString(G.font, str); + xco += xfac*BMF_GetStringWidth(G.font, str) +30.0*xfac; + } } else if(last_seq->type==SEQ_MOVIE) { diff --git a/source/blender/src/editseq.c b/source/blender/src/editseq.c index 8565a302f45..27ee7a14315 100644 --- a/source/blender/src/editseq.c +++ b/source/blender/src/editseq.c @@ -777,7 +777,7 @@ void mouse_select_seq(void) if (marker) { int oldflag; /* select timeline marker */ - if ((G.qual & LR_SHIFTKEY)==0) { + if (G.qual & LR_SHIFTKEY) { oldflag= marker->flag; deselect_markers(0, 0); |