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
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2018-12-18 13:54:02 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-12-18 14:14:38 +0300
commita3e4c333b999b26aa33ad2dfda8fa8403b021c83 (patch)
tree4a8021bcc5d95a60a22c83a90510857225f2cc2b /source/blender/makesdna/DNA_scene_types.h
parente5c6dd396494a617303c6cea956343e4303403b8 (diff)
Transform: when snap affect is off for a transform mode, ignore snap settings entirely.
Ref D4022.
Diffstat (limited to 'source/blender/makesdna/DNA_scene_types.h')
-rw-r--r--source/blender/makesdna/DNA_scene_types.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 8be63add398..d312566a4fd 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -1351,7 +1351,7 @@ typedef struct ToolSettings {
char snap_uv_mode;
char snap_flag;
char snap_target;
- char snap_force_increment_flag;
+ char snap_transform_mode_flag;
char proportional, prop_mode;
@@ -1910,11 +1910,11 @@ enum {
#define SCE_SNAP_MODE_NODE_X (1 << 6)
#define SCE_SNAP_MODE_NODE_Y (1 << 7)
-/** #ToolSettings.snap_force_increment_flag */
+/** #ToolSettings.snap_transform_mode_flag */
enum {
- SCE_SNAP_FORCE_INCREMENT_TRANSLATE = (1 << 0),
- SCE_SNAP_FORCE_INCREMENT_ROTATE = (1 << 1),
- SCE_SNAP_FORCE_INCREMENT_SCALE = (1 << 2),
+ SCE_SNAP_TRANSFORM_MODE_TRANSLATE = (1 << 0),
+ SCE_SNAP_TRANSFORM_MODE_ROTATE = (1 << 1),
+ SCE_SNAP_TRANSFORM_MODE_SCALE = (1 << 2),
};
/* ToolSettings.selectmode */