archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Activity

Cleanup: rename playhead to current-frame

Browse Source
This commit is contained in:
Campbell Barton
2021-07-01 11:02:30 +10:00
parent 930ecef9b5
commit 39188f3c99
5 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenloader/intern/versioning_300.c
View File

@@ -462,7 +462,7 @@ void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *bmain)
}
SequencerToolSettings *sequencer_tool_settings = SEQ_tool_settings_ensure(scene);
sequencer_tool_settings->snap_mode = SEQ_SNAP_TO_STRIPS | SEQ_SNAP_TO_PLAYHEAD |
sequencer_tool_settings->snap_mode = SEQ_SNAP_TO_STRIPS | SEQ_SNAP_TO_CURRENT_FRAME |
SEQ_SNAP_TO_STRIP_HOLD;
sequencer_tool_settings->snap_distance = 15;
}

4
source/blender/editors/transform/transform_snap_sequencer.c
View File

@@ -138,7 +138,7 @@ static int seq_get_snap_target_points_count(const TransInfo *t,
count *= SEQ_collection_len(snap_targets);
if (snap_mode & SEQ_SNAP_TO_PLAYHEAD) {
if (snap_mode & SEQ_SNAP_TO_CURRENT_FRAME) {
count++;
}
@@ -164,7 +164,7 @@ static void seq_snap_target_points_build(const TransInfo *t,
int i = 0;
if (snap_mode & SEQ_SNAP_TO_PLAYHEAD) {
if (snap_mode & SEQ_SNAP_TO_CURRENT_FRAME) {
snap_data->target_snap_points[i] = CFRA;
i++;
}

2
source/blender/makesdna/DNA_scene_types.h
View File

@@ -2063,7 +2063,7 @@ enum {
/** #SequencerToolSettings.snap_mode */
#define SEQ_SNAP_TO_STRIPS (1 << 0)
#define SEQ_SNAP_TO_PLAYHEAD (1 << 1)
#define SEQ_SNAP_TO_CURRENT_FRAME (1 << 1)
#define SEQ_SNAP_TO_STRIP_HOLD (1 << 2)
/** #SequencerToolSettings.snap_flag */

6
source/blender/makesrna/intern/rna_scene.c
View File

@@ -191,7 +191,11 @@ const EnumPropertyItem rna_enum_snap_node_element_items[] = {
};
const EnumPropertyItem rna_enum_snap_seq_element_items[] = {
{SEQ_SNAP_TO_PLAYHEAD, "PLAYHEAD", ICON_NONE, "Playhead", "Snap to current frame"},
{SEQ_SNAP_TO_CURRENT_FRAME,
"CURRENT_FRAME",
ICON_NONE,
"Current Frame",
"Snap to current frame"},
{SEQ_SNAP_TO_STRIP_HOLD, "STRIP_HOLD", ICON_NONE, "Hold Offset", "Snap to strip hold offset"},
{0, NULL, 0, NULL, NULL},
};

3
source/blender/sequencer/intern/sequencer.c
View File

@@ -311,7 +311,8 @@ SequencerToolSettings *SEQ_tool_settings_init(void)
SequencerToolSettings *tool_settings = MEM_callocN(sizeof(SequencerToolSettings),
"Sequencer tool settings");
tool_settings->fit_method = SEQ_SCALE_TO_FIT;
tool_settings->snap_mode = SEQ_SNAP_TO_STRIPS | SEQ_SNAP_TO_PLAYHEAD | SEQ_SNAP_TO_STRIP_HOLD;
tool_settings->snap_mode = SEQ_SNAP_TO_STRIPS | SEQ_SNAP_TO_CURRENT_FRAME |
SEQ_SNAP_TO_STRIP_HOLD;
tool_settings->snap_distance = 15;
return tool_settings;
}