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:
authorCampbell Barton <ideasman42@gmail.com>2019-02-20 08:38:21 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-02-20 08:44:54 +0300
commit4d085c9baecb3956c924dc1d96483e685bcf5a29 (patch)
tree4774895e856f6378cd6d663fba381ae6fdae2645 /release
parent7ee9fe499126a611c57cef907b6cdff0a90f6f8d (diff)
Measure Tool: use x/del key to remove the active ruler
Dragging outside the view was only meant to be a temporary workaround.
Diffstat (limited to 'release')
-rw-r--r--release/scripts/presets/keyconfig/keymap_data/blender_default.py2
-rw-r--r--release/scripts/startup/bl_ui/space_toolsystem_toolbar.py11
2 files changed, 9 insertions, 4 deletions
diff --git a/release/scripts/presets/keyconfig/keymap_data/blender_default.py b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
index e3fff42cc5b..335076309bc 100644
--- a/release/scripts/presets/keyconfig/keymap_data/blender_default.py
+++ b/release/scripts/presets/keyconfig/keymap_data/blender_default.py
@@ -5276,6 +5276,8 @@ def km_3d_view_tool_measure(params):
{"space_type": 'VIEW_3D', "region_type": 'WINDOW'},
{"items": [
("view3d.ruler_add", {"type": params.tool_tweak, "value": 'ANY'}, None),
+ ("view3d.ruler_remove", {"type": 'X', "value": 'PRESS'}, None),
+ ("view3d.ruler_remove", {"type": 'DEL', "value": 'PRESS'}, None),
]},
)
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index 62530daa420..f99b2ebb009 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -106,18 +106,21 @@ class _defs_view3d_generic:
def ruler():
def description(context, item, km):
if km is not None:
- kmi = km.keymap_items.find_from_operator("view3d.ruler_add")
+ kmi_add = km.keymap_items.find_from_operator("view3d.ruler_add")
+ kmi_remove = km.keymap_items.find_from_operator("view3d.ruler_remove")
else:
- kmi = None
+ kmi_add = None
+ kmi_remove = None
return (
"Measure distance and angles.\n"
"\u2022 {} anywhere for new measurement.\n"
"\u2022 Drag ruler segment to measure an angle.\n"
- "\u2022 Drag ruler outside the view to remove.\n"
+ "\u2022 {} to remove the active ruler.\n"
"\u2022 Ctrl while dragging to snap.\n"
"\u2022 Shift while dragging to measure surface thickness."
).format(
- kmi_to_string_or_none(kmi)
+ kmi_to_string_or_none(kmi_add),
+ kmi_to_string_or_none(kmi_remove),
)
return dict(
text="Measure",