diff options
author | Campbell Barton <ideasman42@gmail.com> | 2021-07-01 04:02:30 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2021-07-01 04:06:04 +0300 |
commit | 39188f3c9953c887f0d4bcf21387ec09c08ef4f3 (patch) | |
tree | 61db2e6a5e2ee045b126434d8bbc07e7cc94ff92 /source | |
parent | 930ecef9b583a7dca2d886ed893dcfc684772d9c (diff) |
Cleanup: rename playhead to current-frame
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenloader/intern/versioning_300.c | 2 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_snap_sequencer.c | 4 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 6 | ||||
-rw-r--r-- | source/blender/sequencer/intern/sequencer.c | 3 |
5 files changed, 11 insertions, 6 deletions
diff --git a/source/blender/blenloader/intern/versioning_300.c b/source/blender/blenloader/intern/versioning_300.c index 4272f32032d..ecee14d3d58 100644 --- a/source/blender/blenloader/intern/versioning_300.c +++ b/source/blender/blenloader/intern/versioning_300.c @@ -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; } diff --git a/source/blender/editors/transform/transform_snap_sequencer.c b/source/blender/editors/transform/transform_snap_sequencer.c index a180db349ff..91bebc9c59d 100644 --- a/source/blender/editors/transform/transform_snap_sequencer.c +++ b/source/blender/editors/transform/transform_snap_sequencer.c @@ -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++; } diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index f13105ce559..d40de4184b6 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -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 */ diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 1b8fc692611..503c4a1a1f8 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -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}, }; diff --git a/source/blender/sequencer/intern/sequencer.c b/source/blender/sequencer/intern/sequencer.c index f6b37bdb3ab..7907b11989c 100644 --- a/source/blender/sequencer/intern/sequencer.c +++ b/source/blender/sequencer/intern/sequencer.c @@ -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; } |