[Bf-blender-cvs] [50aad904b38] master: Merge branch 'blender-v3.4-release'

[Germano Cavalcante]

Commit: 50aad904b38b44a7d7c9491649476380bb2fab80
Author: Germano Cavalcante
Date:   Wed Nov 23 14:15:22 2022 -0300
Branches: master
https://developer.blender.org/rB50aad904b38b44a7d7c9491649476380bb2fab80

Merge branch 'blender-v3.4-release'

===================================================================



===================================================================

diff --cc source/blender/editors/transform/transform_snap.cc
index 7f73dee760d,4a26a736351..78752ec7846
--- a/source/blender/editors/transform/transform_snap.cc
+++ b/source/blender/editors/transform/transform_snap.cc
@@@ -612,16 -609,26 +612,26 @@@ static bool bm_face_is_snap_target(BMFa
  static eSnapFlag snap_flag_from_spacetype(TransInfo *t)
  {
    ToolSettings *ts = t->settings;
-   if (t->spacetype == SPACE_NODE) {
-     return eSnapFlag(ts->snap_flag_node);
-   }
-   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);
+   switch (t->spacetype) {
+     case SPACE_VIEW3D:
 -      return ts->snap_flag;
++      return eSnapFlag(ts->snap_flag);
+     case SPACE_NODE:
 -      return ts->snap_flag_node;
++      return eSnapFlag(ts->snap_flag_node);
+     case SPACE_IMAGE:
 -      return ts->snap_uv_flag;
++      return eSnapFlag(ts->snap_uv_flag);
+     case SPACE_SEQ:
 -      return ts->snap_flag_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 0;
++      return eSnapFlag(0);
+     default:
+       BLI_assert(false);
+       break;
+   }
 -  return 0;
++  return eSnapFlag(0);
  }
  
  static eSnapMode snap_mode_from_spacetype(TransInfo *t)