[Bf-blender-cvs] [48a7f979a5c] master: Fix grid snap value in recent snapping updates

Campbell Barton noreply at git.blender.org
Wed Aug 21 03:43:12 CEST 2019


Commit: 48a7f979a5cf2669656d25767c4173fb65bfb67d
Author: Campbell Barton
Date:   Wed Aug 21 11:38:53 2019 +1000
Branches: master
https://developer.blender.org/rB48a7f979a5cf2669656d25767c4173fb65bfb67d

Fix grid snap value in recent snapping updates

Increase the size of the snap mode so the flag can be used.

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

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 23a22237269..57ec9e21c10 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -1460,16 +1460,14 @@ 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. */
@@ -1492,7 +1490,7 @@ typedef struct ToolSettings {
   char vgroupsubset;
 
   /* UV painting */
-  char _pad2[3];
+  char _pad2[1];
   char uv_sculpt_settings;
   char uv_relax_method;
   /* XXX: these sculpt_paint_* fields are deprecated, use the



More information about the Bf-blender-cvs mailing list