[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12377] trunk/blender/source/blender: == Sequencer==

[Campbell Barton]

Revision: 12377
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12377
Author:   campbellbarton
Date:     2007-10-24 15:12:07 +0200 (Wed, 24 Oct 2007)

Log Message:
-----------
==Sequencer==
added an option to reload selected strip data (Alt+R - same as reloading images in the imaeg 
viewer)
made the sequencer max memory limit 16gig for 64bit's.

Modified Paths:
--------------
    trunk/blender/source/blender/include/BIF_editseq.h
    trunk/blender/source/blender/src/buttons_scene.c
    trunk/blender/source/blender/src/editseq.c
    trunk/blender/source/blender/src/header_seq.c
    trunk/blender/source/blender/src/space.c

Modified: trunk/blender/source/blender/include/BIF_editseq.h
===================================================================
--- trunk/blender/source/blender/include/BIF_editseq.h	2007-10-24 13:09:02 UTC (rev 12376)
+++ trunk/blender/source/blender/include/BIF_editseq.h	2007-10-24 13:12:07 UTC (rev 12377)
@@ -40,6 +40,7 @@
 void				borderselect_seq(void);
 void				boundbox_seq(void);
 void				change_sequence(void);
+void				reload_sequence(void);
 void				update_seq_ipo_rect(struct Sequence * seq);
 void				update_seq_icu_rects(struct Sequence * seq);
 struct Sequence*	get_last_seq();

Modified: trunk/blender/source/blender/src/buttons_scene.c
===================================================================
--- trunk/blender/source/blender/src/buttons_scene.c	2007-10-24 13:09:02 UTC (rev 12376)
+++ trunk/blender/source/blender/src/buttons_scene.c	2007-10-24 13:12:07 UTC (rev 12377)
@@ -1576,7 +1576,7 @@
 			uiDefButF(block, COL, B_NOP, "", xofs+110, yofs, 90, 19, G.scene->r.fg_stamp, 0, 0, 0, 0, "Foreground text color");
 			uiDefButF(block, COL, B_NOP, "", xofs+210, yofs, 90, 19, G.scene->r.bg_stamp, 0, 0, 0, 0, "Background color");
 			yofs -= 30;
-			uiDefButF(block, NUMSLI, B_NOP, "A", xofs+110, yofs, 180, 19, &G.scene->r.bg_stamp[3], 0, 1.0, 0, 0, "Alpha for text background");
+			uiDefButF(block, NUMSLI, B_NOP, "A ", xofs+110, yofs, 190, 19, &G.scene->r.bg_stamp[3], 0, 1.0, 0, 0, "Alpha for text background");
 			yofs += 105;
 		} else {
 			yofs += 30;

Modified: trunk/blender/source/blender/src/editseq.c
===================================================================
--- trunk/blender/source/blender/src/editseq.c	2007-10-24 13:09:02 UTC (rev 12376)
+++ trunk/blender/source/blender/src/editseq.c	2007-10-24 13:12:07 UTC (rev 12377)
@@ -1987,6 +1987,19 @@
 
 }
 
+void reload_sequence(void)
+{
+	Editing *ed= G.scene->ed;
+	Sequence *seq;
+	WHILE_SEQ(ed->seqbasep) {
+		if(seq->flag & SELECT) {
+			update_changed_seq_and_deps(seq, 0, 1);
+		}
+	}
+	END_SEQ
+	allqueue(REDRAWSEQ, 0);
+}
+
 void reassign_inputs_seq_effect()
 {
 	Editing *ed= G.scene->ed;

Modified: trunk/blender/source/blender/src/header_seq.c
===================================================================
--- trunk/blender/source/blender/src/header_seq.c	2007-10-24 13:09:02 UTC (rev 12376)
+++ trunk/blender/source/blender/src/header_seq.c	2007-10-24 13:12:07 UTC (rev 12377)
@@ -432,6 +432,9 @@
 	case 16:
 		seq_separate_images();
 		break;
+	case 17:
+		reload_sequence();
+		break;
 	}
 }
 
@@ -497,6 +500,9 @@
 		}
 	}
 	
+	uiDefBut(block, SEPR, 0, "",        0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Reload Strip Data...|Alt R", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 17, "");
+	
 
 	if(curarea->headertype==HEADERTOP) {
 		uiBlockSetDirection(block, UI_DOWN);

Modified: trunk/blender/source/blender/src/space.c
===================================================================
--- trunk/blender/source/blender/src/space.c	2007-10-24 13:09:02 UTC (rev 12376)
+++ trunk/blender/source/blender/src/space.c	2007-10-24 13:12:07 UTC (rev 12377)
@@ -3741,7 +3741,10 @@
 			"Enables automatic saving of preview images in the .blend file");
 		
 	} else if (U.userpref == 4) { /* system & opengl */
-
+		int memcachemax;
+		if (sizeof(void *) ==8)	memcachemax = 1024*16; /* 64bit system, 16 gig of ram would be nice */
+		else					memcachemax = 1024; /* 32 bit system, cant address over 2gig anyway */
+		
 		uiDefBut(block, LABEL,0,"Solid OpenGL lights:",
 			xpos+edgsp, y6label, mpref, buth,
 			0, 0, 0, 0, 0, "");
@@ -3842,11 +3845,12 @@
 			  (xpos+edgsp+(4*mpref)+(4*midsp)), y6, mpref, buth, 
 			  &U.prefetchframes, 0.0, 500.0, 20, 2, 
 			  "Number of frames to render ahead during playback.");
-
+		
 		uiDefButI(block, NUM, B_MEMCACHELIMIT, "MEM Cache Limit ",
 			  (xpos+edgsp+(4*mpref)+(4*midsp)), y5, mpref, buth, 
-			  &U.memcachelimit, 0.0, 1024.0, 30, 2, 
-			  "Memory cache limit in sequencer");
+			   &U.memcachelimit, 0.0, (float)memcachemax, 30, 2, 
+			  "Memory cache limit in sequencer (megabytes)");
+		
 		uiDefButS(block, NUM, B_REDR, "Frameserver Port ",
 			  (xpos+edgsp+(4*mpref)+(4*midsp)), y4, mpref, buth, 
 			  &U.frameserverport, 0.0, 32727.0, 30, 2, 
@@ -4633,9 +4637,11 @@
 			}
 			break;
 		case RKEY:
-			if((G.qual==LR_SHIFTKEY))
+			if(G.qual==LR_SHIFTKEY)
 				seq_remap_paths();
-			else
+			if(G.qual==LR_ALTKEY)
+				reload_sequence();
+			else if (G.qual==0)
 				reassign_inputs_seq_effect();
 			break;
 		case SKEY: