griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.2-release'

Browse Source
This commit is contained in:
Campbell Barton
2024-07-08 22:36:16 +10:00
parent df162e5f1b 9a0b5ac0c6
commit 6ed97d7bd6
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/space_sequencer/sequencer_edit.cc
View File

@@ -1993,7 +1993,7 @@ static int sequencer_meta_make_exec(bContext *C, wmOperator *op)
}
seqm->machine = active_seq ? active_seq->machine : channel_max;
BLI_strncpy(seqm->name + 2, "MetaStrip", sizeof(seqm->name) - 2);
BLI_strncpy(seqm->name + 2, DATA_("MetaStrip"), sizeof(seqm->name) - 2);
SEQ_sequence_base_unique_name_recursive(scene, &ed->seqbase, seqm);
seqm->start = meta_start_frame;
seqm->len = meta_end_frame - meta_start_frame;

4
source/blender/sequencer/intern/channels.cc
View File

@@ -15,6 +15,8 @@
#include "BLI_blenlib.h"
#include "BLT_translation.hh"
#include "SEQ_channels.hh"
ListBase *SEQ_channels_displayed_get(Editing *ed)
@@ -33,7 +35,7 @@ void SEQ_channels_ensure(ListBase *channels)
for (int i = 0; i < MAXSEQ + 1; i++) {
SeqTimelineChannel *channel = static_cast<SeqTimelineChannel *>(
MEM_callocN(sizeof(SeqTimelineChannel), "seq timeline channel"));
SNPRINTF(channel->name, "Channel %d", i);
SNPRINTF(channel->name, DATA_("Channel %d"), i);
channel->index = i;
BLI_addtail(channels, channel);
}