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

Merge branch 'blender-v4.4-release'

Browse Source
This commit is contained in:
Richard Antalik
2025-02-07 01:29:56 +01:00
parent aea0cf9867 69b2f603de
commit a56a1ce5da
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/blenloader/intern/versioning_400.cc
View File

@@ -5647,13 +5647,6 @@ void blo_do_versions_400(FileData *fd, Library * /*lib*/, Main *bmain)
}
}
if (!MAIN_VERSION_FILE_ATLEAST(bmain, 404, 5)) {
LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) {
SequencerToolSettings *sequencer_tool_settings = SEQ_tool_settings_ensure(scene);
sequencer_tool_settings->snap_mode |= SEQ_SNAP_TO_RETIMING;
}
}
if (!MAIN_VERSION_FILE_ATLEAST(bmain, 404, 6)) {
add_subsurf_node_limit_surface_option(*bmain);
}
@@ -5828,6 +5821,13 @@ void blo_do_versions_400(FileData *fd, Library * /*lib*/, Main *bmain)
FOREACH_NODETREE_END;
}
if (!MAIN_VERSION_FILE_ATLEAST(bmain, 404, 28)) {
LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) {
SequencerToolSettings *sequencer_tool_settings = SEQ_tool_settings_ensure(scene);
sequencer_tool_settings->snap_mode |= SEQ_SNAP_TO_RETIMING;
}
}
/* Always run this versioning; meshes are written with the legacy format which always needs to
* be converted to the new format on file load. Can be moved to a subversion check in a larger
* breaking release. */

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

@@ -2478,12 +2478,13 @@ enum {
SEQ_SNAP_TO_CURRENT_FRAME = 1 << 1,
SEQ_SNAP_TO_STRIP_HOLD = 1 << 2,
SEQ_SNAP_TO_MARKERS = 1 << 3,
SEQ_SNAP_TO_RETIMING = 1 << 4,
/* Preview snapping. */
SEQ_SNAP_TO_PREVIEW_BORDERS = 1 << 4,
SEQ_SNAP_TO_PREVIEW_CENTER = 1 << 5,
SEQ_SNAP_TO_STRIPS_PREVIEW = 1 << 6,
SEQ_SNAP_TO_RETIMING = 1 << 7,
};
/** #SequencerToolSettings::snap_flag */