Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix regression with incremental snap in Graph Editor

Browse Source 
Regression introduced in {rBb0d9e6797fb8}.

Previously the Graphics Editor had a conflict with two different snap
types. Auto-Snap and Snap with Ctrl.

It is now clearer which snap should prevail.
This commit is contained in:
Germano Cavalcante
2021-10-14 13:03:26 -03:00
parent b42ce0c54c
commit 5e12e62a6a
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/transform/transform_snap.c
View File

@@ -615,7 +615,7 @@ static void initSnappingMode(TransInfo *t)
t->tsnap.mode |= SCE_SNAP_MODE_GRID; t->tsnap.mode |= SCE_SNAP_MODE_GRID;
} }
} }
else if (ELEM(t->spacetype, SPACE_GRAPH, SPACE_ACTION, SPACE_NLA)) { else if (ELEM(t->spacetype, SPACE_ACTION, SPACE_NLA)) {
/* No incremental snapping. */ /* No incremental snapping. */
t->tsnap.mode = 0; t->tsnap.mode = 0;
} }

11
source/blender/editors/transform/transform_snap_animation.c
View File

@@ -56,10 +56,15 @@ short getAnimEdit_SnapMode(TransInfo *t)
} }
} }
else if (t->spacetype == SPACE_GRAPH) { else if (t->spacetype == SPACE_GRAPH) {
SpaceGraph *sipo = (SpaceGraph *)t->area->spacedata.first; if ((t->data_type == TFM_TRANSLATION) && activeSnap(t)) {
/* Use the translate mode snap. */
}
else {
SpaceGraph *sipo = (SpaceGraph *)t->area->spacedata.first;
if (sipo) { if (sipo) {
autosnap = sipo->autosnap; autosnap = sipo->autosnap;
}
} }
} }
else if (t->spacetype == SPACE_NLA) { else if (t->spacetype == SPACE_NLA) {