[Bf-blender-cvs] [75127b6be78] master: Revert "Fix grid snap value in recent snapping updates"

[mano-wii]

Commit: 75127b6be78a7ebd69410f989a13eff9e1188d82
Author: mano-wii
Date:   Thu Aug 22 09:03:20 2019 -0300
Branches: master
https://developer.blender.org/rB75127b6be78a7ebd69410f989a13eff9e1188d82

Revert "Fix grid snap value in recent snapping updates"

This reverts commit 48a7f979a5cf2669656d25767c4173fb65bfb67d.

Another solution to come.

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

M	source/blender/makesdna/DNA_scene_types.h

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

diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 57ec9e21c10..23a22237269 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -1460,14 +1460,16 @@ typedef struct ToolSettings {
 
   char edge_mode_live_unwrap;
 
+  char _pad1[1];
+
   /* Transform */
   char transform_pivot_point;
   char transform_flag;
+  char snap_mode, snap_node_mode;
+  char snap_uv_mode;
   char snap_flag;
   char snap_target;
   char snap_transform_mode_flag;
-  short snap_mode, snap_node_mode;
-  short snap_uv_mode;
 
   char proportional_edit, prop_mode;
   /** Proportional edit, object mode. */
@@ -1490,7 +1492,7 @@ typedef struct ToolSettings {
   char vgroupsubset;
 
   /* UV painting */
-  char _pad2[1];
+  char _pad2[3];
   char uv_sculpt_settings;
   char uv_relax_method;
   /* XXX: these sculpt_paint_* fields are deprecated, use the