diff options
author | Campbell Barton <ideasman42@gmail.com> | 2007-10-24 17:12:07 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2007-10-24 17:12:07 +0400 |
commit | 79224961836db454b454f20479a76b83e3eed3bc (patch) | |
tree | f38ec7789f92c747ce510700c61df0c540ce32c0 /source | |
parent | a9110ee0333b5dfc8af42919e53c7cd35e1f6cb1 (diff) |
==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.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/include/BIF_editseq.h | 1 | ||||
-rw-r--r-- | source/blender/src/buttons_scene.c | 2 | ||||
-rw-r--r-- | source/blender/src/editseq.c | 13 | ||||
-rw-r--r-- | source/blender/src/header_seq.c | 6 | ||||
-rw-r--r-- | source/blender/src/space.c | 18 |
5 files changed, 33 insertions, 7 deletions
diff --git a/source/blender/include/BIF_editseq.h b/source/blender/include/BIF_editseq.h index d1432c7c48c..74baf12c11a 100644 --- a/source/blender/include/BIF_editseq.h +++ b/source/blender/include/BIF_editseq.h @@ -40,6 +40,7 @@ void add_sequence(int type); 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(); diff --git a/source/blender/src/buttons_scene.c b/source/blender/src/buttons_scene.c index 7232698a7a8..c734eac0735 100644 --- a/source/blender/src/buttons_scene.c +++ b/source/blender/src/buttons_scene.c @@ -1576,7 +1576,7 @@ static void render_panel_stamp(void) 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; diff --git a/source/blender/src/editseq.c b/source/blender/src/editseq.c index 87b963a0bd7..88705404965 100644 --- a/source/blender/src/editseq.c +++ b/source/blender/src/editseq.c @@ -1987,6 +1987,19 @@ void change_sequence(void) } +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; diff --git a/source/blender/src/header_seq.c b/source/blender/src/header_seq.c index a0edbdc316f..4075371108b 100644 --- a/source/blender/src/header_seq.c +++ b/source/blender/src/header_seq.c @@ -432,6 +432,9 @@ static void do_seq_editmenu(void *arg, int event) case 16: seq_separate_images(); break; + case 17: + reload_sequence(); + break; } } @@ -497,6 +500,9 @@ static uiBlock *seq_editmenu(void *arg_unused) } } + 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); diff --git a/source/blender/src/space.c b/source/blender/src/space.c index f6f6768e35c..68529d656fc 100644 --- a/source/blender/src/space.c +++ b/source/blender/src/space.c @@ -3741,7 +3741,10 @@ void drawinfospace(ScrArea *sa, void *spacedata) "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 @@ void drawinfospace(ScrArea *sa, void *spacedata) (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 @@ static void winqreadseqspace(ScrArea *sa, void *spacedata, BWinEvent *evt) } 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: |