diff options
| author | Richard Antalik <richardantalik@gmail.com> | 2021-07-29 11:27:54 +0300 |
|---|---|---|
| committer | Richard Antalik <richardantalik@gmail.com> | 2021-07-29 12:38:43 +0300 |
| commit | 5c9979ff0324d9bc26092037899b24ad69f1c34f (patch) | |
| tree | 7d8215c365f720bd34c637af0230c9da131b4796 /source | |
| parent | 3964785a1458ef5ba6d28485ff5f7343ccf3f61c (diff) | |
VSE: don't snap by default
Snapping by default goes against convention, so this setting was
re-evaluated. Also snapping by default can conflict with new image
transform system, see T90156
There wasn't consensus, so disable snapping by default to follow
established convention.
ref T89665
Reviewed By: campbellbarton
Differential Revision: https://developer.blender.org/D12054
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/BKE_blender_version.h | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/scene.c | 1 | ||||
| -rw-r--r-- | source/blender/blenloader/intern/versioning_300.c | 7 |
3 files changed, 8 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h index 28be2c0f30d..62700d0647f 100644 --- a/source/blender/blenkernel/BKE_blender_version.h +++ b/source/blender/blenkernel/BKE_blender_version.h @@ -39,7 +39,7 @@ extern "C" { /* Blender file format version. */ #define BLENDER_FILE_VERSION BLENDER_VERSION -#define BLENDER_FILE_SUBVERSION 13 +#define BLENDER_FILE_SUBVERSION 14 /* Minimum Blender version that supports reading file written with the current * version. Older Blender versions will test this and show a warning if the file diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index a3a0ce0060b..3f75d0963c6 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -231,7 +231,6 @@ static void scene_init_data(ID *id) /* Sequencer */ scene->toolsettings->sequencer_tool_settings = SEQ_tool_settings_init(); - scene->toolsettings->snap_flag |= SCE_SNAP_SEQ; for (size_t i = 0; i < ARRAY_SIZE(scene->orientation_slots); i++) { scene->orientation_slots[i].index_custom = -1; diff --git a/source/blender/blenloader/intern/versioning_300.c b/source/blender/blenloader/intern/versioning_300.c index e46073ba0de..fb22a88c28e 100644 --- a/source/blender/blenloader/intern/versioning_300.c +++ b/source/blender/blenloader/intern/versioning_300.c @@ -671,6 +671,13 @@ void blo_do_versions_300(FileData *fd, Library *UNUSED(lib), Main *bmain) } } + if (!MAIN_VERSION_ATLEAST(bmain, 300, 14)) { + LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) { + ToolSettings *tool_settings = scene->toolsettings; + tool_settings->snap_flag &= ~SCE_SNAP_SEQ; + } + } + /** * Versioning code until next subversion bump goes here. * |