blender
/
blender
136
406
Fork 588
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

Merge branch 'blender-v3.4-release'

This commit is contained in:
Germano Cavalcante 2022-11-23 14:15:22 -03:00
parent f13160d188 962e221cd3
commit 50aad904b3
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -612,16 +612,26 @@ static bool bm_face_is_snap_target(BMFace *f, void *UNUSED(user_data))
static eSnapFlag snap_flag_from_spacetype(TransInfo *t)
{
ToolSettings *ts = t->settings;
if (t->spacetype == SPACE_NODE) {
return eSnapFlag(ts->snap_flag_node);
switch (t->spacetype) {
case SPACE_VIEW3D:
return eSnapFlag(ts->snap_flag);
case SPACE_NODE:
return eSnapFlag(ts->snap_flag_node);
case SPACE_IMAGE:
return eSnapFlag(ts->snap_uv_flag);
case SPACE_SEQ:
return eSnapFlag(ts->snap_flag_seq);
case SPACE_GRAPH:
case SPACE_ACTION:
case SPACE_NLA:
/* These editors have their own "Auto-Snap" activation option.
* See #getAnimEdit_SnapMode. */
return eSnapFlag(0);
default:
BLI_assert(false);
break;
}
if (t->spacetype == SPACE_IMAGE) {
return eSnapFlag(ts->snap_uv_flag);
}
if (t->spacetype == SPACE_SEQ) {
return eSnapFlag(ts->snap_flag_seq);
}
return eSnapFlag(ts->snap_flag);
return eSnapFlag(0);
}
static eSnapMode snap_mode_from_spacetype(TransInfo *t)