draw image path and size stats in the sequencer again (removed when making single...
authorCampbell Barton <ideasman42@gmail.com>
Tue, 20 Nov 2007 14:09:34 +0000 (14:09 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 20 Nov 2007 14:09:34 +0000 (14:09 +0000)
sequencer marker selection didn't work like the marker view.

source/blender/src/drawseq.c
source/blender/src/editseq.c

index 770063536404b5e124a12c7eac3298f6274ff201..bb04440bd0fefc3afdb55b5707b760a83d7b64b7 100644 (file)
@@ -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) {
 
index 8565a302f45a62a712609fa5d14cd81032e61ec6..27ee7a1431521c495833d8575ef296955158e05c 100644 (file)
@@ -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);