diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-12-18 13:54:02 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-12-18 14:14:38 +0300 |
| commit | a3e4c333b999b26aa33ad2dfda8fa8403b021c83 (patch) | |
| tree | 4a8021bcc5d95a60a22c83a90510857225f2cc2b /source/blender/makesrna/intern/rna_scene.c | |
| parent | e5c6dd396494a617303c6cea956343e4303403b8 (diff) | |
Transform: when snap affect is off for a transform mode, ignore snap settings entirely.
Ref D4022.
Diffstat (limited to 'source/blender/makesrna/intern/rna_scene.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 52e4c62ea00..037b16ab5df 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -2478,24 +2478,24 @@ static void rna_def_tool_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Project onto Self", "Snap onto itself (Edit Mode Only)"); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); /* header redraw */ - prop = RNA_def_property(srna, "use_snap_force_increment_translate", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_negative_sdna(prop, NULL, "snap_force_increment_flag", SCE_SNAP_FORCE_INCREMENT_TRANSLATE); - RNA_def_property_ui_text(prop, "Resctrict Translation", - "Translate uses the snapping modes, otherwise use increment snapping"); + prop = RNA_def_property(srna, "use_snap_translate", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_sdna(prop, NULL, "snap_transform_mode_flag", SCE_SNAP_TRANSFORM_MODE_TRANSLATE); + RNA_def_property_ui_text(prop, "Use Snap for Translation", + "Move is affected by snapping settings"); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); /* header redraw */ - prop = RNA_def_property(srna, "use_snap_force_increment_rotate", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_negative_sdna(prop, NULL, "snap_force_increment_flag", SCE_SNAP_FORCE_INCREMENT_ROTATE); + prop = RNA_def_property(srna, "use_snap_rotate", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_sdna(prop, NULL, "snap_transform_mode_flag", SCE_SNAP_TRANSFORM_MODE_ROTATE); RNA_def_property_boolean_default(prop, false); - RNA_def_property_ui_text(prop, "Resctrict Rotate", - "Rotate uses the snapping modes, otherwise use increment snapping"); + RNA_def_property_ui_text(prop, "Use Snap for Rotation", + "Rotate is affected by the snapping settings"); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); /* header redraw */ - prop = RNA_def_property(srna, "use_snap_force_increment_scale", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_negative_sdna(prop, NULL, "snap_force_increment_flag", SCE_SNAP_FORCE_INCREMENT_SCALE); + prop = RNA_def_property(srna, "use_snap_scale", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_sdna(prop, NULL, "snap_transform_mode_flag", SCE_SNAP_TRANSFORM_MODE_SCALE); RNA_def_property_boolean_default(prop, false); - RNA_def_property_ui_text(prop, "Resctrict Scale", - "Scale uses the snapping modes, otherwise use increment snapping"); + RNA_def_property_ui_text(prop, "Use Snap for Scale", + "Scale is affected by snapping settings"); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); /* header redraw */ prop = RNA_def_property(srna, "use_gizmo_mode", PROP_ENUM, PROP_NONE); |