From daba3e871ff572ff44e82e67084e32653a8559f4 Mon Sep 17 00:00:00 2001 From: mano-wii Date: Tue, 20 Aug 2019 19:35:11 -0300 Subject: 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. --- source/blender/makesdna/DNA_scene_types.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source') 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), -- cgit v1.2.3