Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authormano-wii <germano.costa@ig.com.br>2019-08-21 01:35:11 +0300
committermano-wii <germano.costa@ig.com.br>2019-08-21 01:35:11 +0300
commitdaba3e871ff572ff44e82e67084e32653a8559f4 (patch)
tree4ec9a2f1e27b964a8d4baea42207fbb061917d8a /source
parentdd08d68df835e54ccd1fdf24ae154e461faab685 (diff)
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.
Diffstat (limited to 'source')
-rw-r--r--source/blender/makesdna/DNA_scene_types.h4
1 files changed, 3 insertions, 1 deletions
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),