[Bf-blender-cvs] [4b326d5a78b] master: Fix T101040: Blender Crashes When snap roll a bone in armature
Germano Cavalcante
noreply at git.blender.org
Fri Sep 16 14:16:18 CEST 2022
Commit: 4b326d5a78b63aae7e5a788ef489aa95315456dd
Author: Germano Cavalcante
Date: Fri Sep 16 09:03:08 2022 -0300
Branches: master
https://developer.blender.org/rB4b326d5a78b63aae7e5a788ef489aa95315456dd
Fix T101040: Blender Crashes When snap roll a bone in armature
The modes that don't support individual projection shouldn't support
FACE_NEAREST either.
Differential Revision: https://developer.blender.org/D15970
===================================================================
M source/blender/editors/transform/transform_snap.c
===================================================================
diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c
index b47592b61cd..31d36fc4d92 100644
--- a/source/blender/editors/transform/transform_snap.c
+++ b/source/blender/editors/transform/transform_snap.c
@@ -125,15 +125,11 @@ bool activeSnap(const TransInfo *t)
bool activeSnap_SnappingIndividual(const TransInfo *t)
{
- if (activeSnap(t) && t->tsnap.mode & SCE_SNAP_MODE_FACE_NEAREST) {
- return true;
- }
-
- if (!t->tsnap.project) {
+ if (!activeSnap(t) || (t->flag & T_NO_PROJECT)) {
return false;
}
- if (!activeSnap(t) || (t->flag & T_NO_PROJECT)) {
+ if (!(t->tsnap.project || (t->tsnap.mode & SCE_SNAP_MODE_FACE_NEAREST))) {
return false;
}
More information about the Bf-blender-cvs
mailing list