if( test_overlap_seq(last_seq) ) shuffle_seq(last_seq);
- BIF_undo_push("Load/change Sequencer plugin");
+ BIF_undo_push("Load/Change Plugin, Sequencer");
}
}
END_SEQ
- BIF_undo_push("(De)select all Sequencer");
+ BIF_undo_push("(De)select all Strips, Sequencer");
}
static void recurs_sel_seq(Sequence *seqm)
END_SEQ
allqueue(REDRAWSEQ, 0);
- BIF_undo_push("Swap select all Sequencer");
+ BIF_undo_push("Swap Selected Strips, Sequencer");
}
void select_dir_from_last(int lr)
{
Sequence *seq=get_last_seq();
+ if (seq==NULL)
+ return;
+
+ select_channel_direction(seq,lr);
+ allqueue(REDRAWSEQ, 0);
- if (seq) select_channel_direction(seq,lr);
+ if (lr==1) BIF_undo_push("Select Strips to the Left, Sequencer");
+ else BIF_undo_push("Select Strips to the Right, Sequencer");
}
void select_surrounding_handles(Sequence *test)
{
Sequence *seq=get_last_seq();
- if (seq) select_surrounding_handles(seq);
+ if (seq==NULL)
+ return;
+
+ select_surrounding_handles(seq);
+ allqueue(REDRAWSEQ, 0);
+ BIF_undo_push("Select Surrounding Handles, Sequencer");
}
void select_neighbor_from_last(int lr)
{
Sequence *seq=get_last_seq();
Sequence *neighbor;
-
+ int change = 0;
if (seq) {
neighbor=find_neighboring_sequence(seq, lr);
if (neighbor) {
break;
}
seq->flag |= SELECT;
+ change = 1;
}
}
+ if (change) {
+ allqueue(REDRAWSEQ, 0);
+
+ if (lr==1) BIF_undo_push("Select Left Handles, Sequencer");
+ else BIF_undo_push("Select Right Handles, Sequencer");
+ }
}
void mouse_select_seq(void)
force_draw(0);
if(get_last_seq()) allqueue(REDRAWIPO, 0);
- BIF_undo_push("Select Sequencer");
+ BIF_undo_push("Select Strips, Sequencer");
std_rmouse_transform(transform_seq);
}
waitcursor(0);
- BIF_undo_push("Add image strip Sequencer");
+ BIF_undo_push("Add Image Strip, Sequencer");
transform_seq('g', 0);
}
waitcursor(0);
- BIF_undo_push("Add movie strip Sequencer");
+ BIF_undo_push("Add Movie Strip, Sequencer");
transform_seq('g', 0);
}
waitcursor(0);
- BIF_undo_push("Add movie and HD-audio strip Sequencer");
+ BIF_undo_push("Add Movie and HD-Audio Strip, Sequencer");
transform_seq('g', 0);
}
waitcursor(0);
- BIF_undo_push("Add ram sound strip Sequencer");
+ BIF_undo_push("Add Sound (RAM) Strip, Sequencer");
transform_seq('g', 0);
}
waitcursor(0);
- BIF_undo_push("Add hd sound strip Sequencer");
+ BIF_undo_push("Add Sound (HD) Strip, Sequencer");
transform_seq('g', 0);
}
/* push undo and go into grab mode */
if(newseq->type == SEQ_PLUGIN) {
- BIF_undo_push("Add plugin strip Sequencer");
+ BIF_undo_push("Add Plugin Strip, Sequencer");
} else {
- BIF_undo_push("Add effect strip Sequencer");
+ BIF_undo_push("Add Effect Strip, Sequencer");
}
transform_seq('g', 0);
strip->us= 1;
if(seq->len>0) strip->stripdata= MEM_callocN(seq->len*sizeof(StripElem), "stripelem");
- BIF_undo_push("Add scene strip Sequencer");
+ BIF_undo_push("Add Scene Strip, Sequencer");
transform_seq('g', 0);
}
}
update_changed_seq_and_deps(last_seq, 0, 1);
allqueue(REDRAWSEQ, 0);
- BIF_undo_push("Change effect Sequencer");
+ BIF_undo_push("Change Strip Effect, Sequencer");
}
}
else if(last_seq->type == SEQ_IMAGE) {
ms= ms->prev;
}
- BIF_undo_push("Delete from Sequencer");
+ BIF_undo_push("Delete Strip(s), Sequencer");
allqueue(REDRAWSEQ, 0);
}
recurs_dupli_seq(ed->seqbasep, &new);
addlisttolist(ed->seqbasep, &new);
- BIF_undo_push("Add duplicate Sequencer");
+ BIF_undo_push("Add Duplicate, Sequencer");
transform_seq('g', 0);
}
}
END_SEQ
- BIF_undo_push("Remap paths in Sequencer");
+ BIF_undo_push("Remap Paths, Sequencer");
allqueue(REDRAWSEQ, 0);
}
}
}
- BIF_undo_push("No gaps Sequencer");
+ BIF_undo_push("No Gaps, Sequencer");
allqueue(REDRAWSEQ, 0);
}
if(seqm->len) seqm->strip->stripdata= MEM_callocN(seqm->len*sizeof(StripElem), "metastripdata");
set_meta_stripdata(seqm);
- BIF_undo_push("Make Meta Sequencer");
+ BIF_undo_push("Make Meta Strip, Sequencer");
allqueue(REDRAWSEQ, 0);
}
if(last_seq==0 || last_seq->type!=SEQ_META) return;
- if(okee("Un Meta")==0) return;
+ if(okee("Un Meta Strip")==0) return;
addlisttolist(ed->seqbasep, &last_seq->seqbase);
sort_seq();
- BIF_undo_push("Un-make Meta Sequencer");
+ BIF_undo_push("Un-Make Meta Strip, Sequencer");
allqueue(REDRAWSEQ, 0);
}
MEM_freeN(ms);
allqueue(REDRAWSEQ, 0);
- BIF_undo_push("Exit meta strip Sequence");
+ BIF_undo_push("Exit Meta Strip, Sequence");
}
set_last_seq(NULL);
allqueue(REDRAWSEQ, 0);
- BIF_undo_push("Enter meta strip Sequence");
+ BIF_undo_push("Enter Meta Strip, Sequence");
}
MEM_freeN(transmain);
if (mode=='g')
- BIF_undo_push("Transform Grab");
+ BIF_undo_push("Transform Grab, Sequencer");
else if (mode=='e')
- BIF_undo_push("Transform Extend");
+ BIF_undo_push("Transform Extend, Sequencer");
allqueue(REDRAWSEQ, 0);
}
}
}
if(seq) {
- error("Cannot cut Meta strips");
+ error("Cannot Cut Meta Strips");
return;
}
}
if(tot==0) {
- error("No strips to cut");
+ error("No Strips to Cut");
return;
}
MEM_freeN(transmain);
allqueue(REDRAWSEQ, 0);
+ BIF_undo_push("Cut Strips, Sequencer");
+}
+
+void seq_separate_images(void)
+{
+ Editing *ed;
+ Sequence *seq, *seq_new, *seq_next;
+ Strip *strip_new;
+ StripElem *se, *se_new;
+ int start, start_ofs, cfra, frame_end;
+ static int step= 1;
+
+ add_numbut(0, NUM|INT, "Image Duration:", 1, 256, &step, NULL);
+ if (!do_clever_numbuts("Separate Images", 1, REDRAW))
+ return;
+
+ ed= G.scene->ed;
+ if(ed==0) return;
+
+ seq= ed->seqbasep->first;
+
+ while (seq) {
+ if((seq->flag & SELECT) && (seq->type == SEQ_IMAGE) && (seq->len > 1)) {
+ /* remove seq so overlap tests dont conflict,
+ see free_sequence below for the real free'ing */
+ seq_next = seq->next;
+ BLI_remlink(ed->seqbasep, seq);
+ if(seq->ipo) seq->ipo->id.us--;
+
+ start_ofs = cfra = seq_tx_get_final_left(seq);
+ frame_end = seq_tx_get_final_right(seq);
+
+ while (cfra < frame_end) {
+ /* new seq */
+ se = give_stripelem(seq, cfra);
+
+ seq_new= alloc_sequence(((Editing *)G.scene->ed)->seqbasep, start_ofs, seq->machine);
+ seq_new->type= SEQ_IMAGE;
+ seq_new->len = 1;
+ seq_new->endstill = step-1;
+
+ /* new strip */
+ seq_new->strip= strip_new= MEM_callocN(sizeof(Strip)*1, "strip");
+ strip_new->len= 1;
+ strip_new->us= 1;
+ strncpy(strip_new->dir, seq->strip->dir, FILE_MAXDIR-1);
+
+ /* new stripdata */
+ strip_new->stripdata= se_new= MEM_callocN(sizeof(StripElem)*1, "stripelem");
+ strncpy(se_new->name, se->name, FILE_MAXFILE-1);
+ se_new->ok= 1;
+
+ calc_sequence(seq_new);
+ seq_new->flag &= ~SEQ_OVERLAP;
+ if (test_overlap_seq(seq_new)) {
+ shuffle_seq(seq_new);
+ }
+
+ cfra++;
+ start_ofs += step;
+ }
+
+ free_sequence(seq);
+ seq = seq->next;
+ } else {
+ seq = seq->next;
+ }
+ }
+
+ /* as last: */
+ sort_seq();
+ BIF_undo_push("Separate Image Strips, Sequencer");
+ allqueue(REDRAWSEQ, 0);
}
void seq_snap_menu(void)
/* as last: */
sort_seq();
- BIF_undo_push("Snap menu Sequencer");
+ BIF_undo_push("Snap Strips, Sequencer");
allqueue(REDRAWSEQ, 0);
}
seq= seq->next;
}
- BIF_undo_push("Border select Sequencer");
+ BIF_undo_push("Border Select, Sequencer");
addqueue(curarea->win, REDRAW, 1);
}
}
case 6: /* Objects on Shared Layers */
case 7: /* Objects in Same Group */
case 8: /* Object Hooks*/
+ case 9: /* Object PassIndex*/
select_object_grouped((short)event);
break;
}
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Objects on Shared Layers|Shift G, 6", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 6, "");
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Objects in Same Group|Shift G, 7", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 7, "");
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Object Hooks|Shift G, 8", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 8, "");
-
+ uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Object PassIndex|Shift G, 9", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 9, "");
+
uiBlockSetDirection(block, UI_RIGHT);
uiTextBoundsBlock(block, 60);
return block;
case 25:
case 26:
case 29:
+ case 30:
copy_attr((short)event);
break;
}
if( give_parteff(ob) ) {
uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Particle Settings|Ctrl C", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 20, "");
}
+
+ uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Object Pass Index|Ctrl C", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 30, "");
}
uiBlockSetDirection(block, UI_RIGHT);