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

Merge branch 'blender-v5.0-release'

Browse Source
This commit is contained in:
Campbell Barton
2025-10-12 21:39:42 +11:00
parent ba6b0ebaeb 2db54c43d8
commit a9d330fe25
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/blender/editors/transform/transform_snap.cc
View File

@@ -729,8 +729,15 @@ static eSnapMode snap_mode_from_spacetype(TransInfo *t)
if (t->options & (CTX_CAMERA | CTX_EDGE_DATA | CTX_PAINT_CURVE)) {
return SCE_SNAP_TO_INCREMENT;
}
return eSnapMode(ts->snap_mode);
eSnapMode snap_mode = eSnapMode(ts->snap_mode);
if (t->mode == TFM_TRANSLATION) {
/* Use grid-snap for absolute snap while translating, see: #147246. */
if ((snap_mode & SCE_SNAP_TO_INCREMENT) && (ts->snap_flag & SCE_SNAP_ABS_GRID)) {
snap_mode &= ~SCE_SNAP_TO_INCREMENT;
snap_mode |= SCE_SNAP_TO_GRID;
}
}
return snap_mode;
}
if (ELEM(t->spacetype, SPACE_ACTION, SPACE_NLA)) {