[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12634] trunk/blender/source/blender/src: draw image path and size stats in the sequencer again ( removed when making single images act differently)

[Campbell Barton]

Revision: 12634
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12634
Author:   campbellbarton
Date:     2007-11-20 15:09:34 +0100 (Tue, 20 Nov 2007)

Log Message:
-----------
draw image path and size stats in the sequencer again (removed when making single images act differently)
sequencer marker selection didn't work like the marker view.

Modified Paths:
--------------
    trunk/blender/source/blender/src/drawseq.c
    trunk/blender/source/blender/src/editseq.c

Modified: trunk/blender/source/blender/src/drawseq.c
===================================================================
--- trunk/blender/source/blender/src/drawseq.c	2007-11-20 14:06:28 UTC (rev 12633)
+++ trunk/blender/source/blender/src/drawseq.c	2007-11-20 14:09:34 UTC (rev 12634)
@@ -916,7 +916,7 @@
 			/* 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 @@
 				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) {
 

Modified: trunk/blender/source/blender/src/editseq.c
===================================================================
--- trunk/blender/source/blender/src/editseq.c	2007-11-20 14:06:28 UTC (rev 12633)
+++ trunk/blender/source/blender/src/editseq.c	2007-11-20 14:09:34 UTC (rev 12634)
@@ -777,7 +777,7 @@
 	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);