diff options
| author | Richard Antalik <richardantalik@gmail.com> | 2021-06-29 21:12:19 +0300 |
|---|---|---|
| committer | Richard Antalik <richardantalik@gmail.com> | 2021-06-29 21:30:31 +0300 |
| commit | fba9cd019f21f29bad1a6f3713370c5172dbc97f (patch) | |
| tree | 5c42ca8e6f4d2f7051088306e99676d7e8b47b7b /source/blender/makesdna | |
| parent | ea43ae4194e293599997f1d0d47430b462b4fd7f (diff) | |
VSE: Improved Snapping
Change snapping behavior to snap strip edges when they are close to snap point.
Default behavior is, that each transformed strip is snapped to any other strip.
Implement snapping controls in sequencer tool settings. These controls include:
- Snapping on/off
- Ability to snap to playhead and strip hold offset points
- Filter snap points by excluding sound or muted strips
- Control snapping distance
Snapping controls are placed in timeline header similar to 3D viewport
Reviewed By: mano-wii
Differential Revision: https://developer.blender.org/D11646
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 30 |
1 files changed, 24 insertions, 6 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 4da2bbb58c0..f13105ce559 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -1336,6 +1336,12 @@ typedef struct MeshStatVis { typedef struct SequencerToolSettings { /* eSeqImageFitMethod */ int fit_method; + short snap_mode; + short snap_flag; + int _pad0; + /** When there are many snap points, 0-1 range corresponds to resolution from boundbox to all + * possible snap points. */ + int snap_distance; } SequencerToolSettings; typedef enum eSeqImageFitMethod { @@ -2039,6 +2045,7 @@ enum { #define SCE_SNAP_NO_SELF (1 << 4) #define SCE_SNAP_ABS_GRID (1 << 5) #define SCE_SNAP_BACKFACE_CULLING (1 << 6) +#define SCE_SNAP_SEQ (1 << 7) /** #ToolSettings.snap_target */ #define SCE_SNAP_TARGET_CLOSEST 0 @@ -2051,15 +2058,26 @@ enum { #define SCE_SNAP_MODE_EDGE (1 << 1) #define SCE_SNAP_MODE_FACE (1 << 2) #define SCE_SNAP_MODE_VOLUME (1 << 3) -#define SCE_SNAP_MODE_INCREMENT (1 << 4) -#define SCE_SNAP_MODE_EDGE_MIDPOINT (1 << 5) -#define SCE_SNAP_MODE_EDGE_PERPENDICULAR (1 << 6) +#define SCE_SNAP_MODE_EDGE_MIDPOINT (1 << 4) +#define SCE_SNAP_MODE_EDGE_PERPENDICULAR (1 << 5) + +/** #SequencerToolSettings.snap_mode */ +#define SEQ_SNAP_TO_STRIPS (1 << 0) +#define SEQ_SNAP_TO_PLAYHEAD (1 << 1) +#define SEQ_SNAP_TO_STRIP_HOLD (1 << 2) + +/** #SequencerToolSettings.snap_flag */ +#define SEQ_SNAP_IGNORE_MUTED (1 << 0) +#define SEQ_SNAP_IGNORE_SOUND (1 << 1) /** #ToolSettings.snap_node_mode */ -#define SCE_SNAP_MODE_NODE_X (1 << 5) -#define SCE_SNAP_MODE_NODE_Y (1 << 6) +#define SCE_SNAP_MODE_NODE_X (1 << 0) +#define SCE_SNAP_MODE_NODE_Y (1 << 1) -/** #ToolSettings.snap_mode and #ToolSettings.snap_node_mode */ +/** + * #ToolSettings.snap_mode and #ToolSettings.snap_node_mode + */ +#define SCE_SNAP_MODE_INCREMENT (1 << 6) #define SCE_SNAP_MODE_GRID (1 << 7) /** #ToolSettings.snap_transform_mode_flag */ |