[Bf-blender-cvs] [daba3e871ff] master: Fix conflict with "Edge Center" snap mode

[mano-wii]

Commit: daba3e871ff572ff44e82e67084e32653a8559f4
Author: mano-wii
Date:   Tue Aug 20 19:35:11 2019 -0300
Branches: master
https://developer.blender.org/rBdaba3e871ff572ff44e82e67084e32653a8559f4

Fix conflict with "Edge Center" snap mode

`SCE_SNAP_MODE_GRID` is used for both nodes and objects.
I don't think it's worth versioning in this case.

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

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 9ab9a0b650a..23a22237269 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -2051,10 +2051,12 @@ enum {
 #define SCE_SNAP_MODE_EDGE_PERPENDICULAR (1 << 6)
 
 /* ToolSettings.snap_node_mode */
-#define SCE_SNAP_MODE_GRID (1 << 5)
 #define SCE_SNAP_MODE_NODE_X (1 << 6)
 #define SCE_SNAP_MODE_NODE_Y (1 << 7)
 
+/* ToolSettings.snap_mode and ToolSettings.snap_node_mode */
+#define SCE_SNAP_MODE_GRID (1 << 8)
+
 /** #ToolSettings.snap_transform_mode_flag */
 enum {
   SCE_SNAP_TRANSFORM_MODE_TRANSLATE = (1 << 0),