Commit: 556b13f03e561b54d4f0186e207f080c786f8b66
Author: Bastien Montagne
Date: Tue Nov 14 22:47:42 2017 +0100
Branches: master
https://developer.blender.org/rB556b13f03e561b54d4f0186e207f080c786f8b66
Fix T53309: Remove default 'Clear loc/rot/scale delta transform' shortcuts.
The loc one (shift-alt-G) was same as 'remove selected from active group'
action... Clear delta transform is not a common operation, so we can
live without a default shortcut for it.
Note that using same key (G) in same space for two completely different
kind of operations is probably a rather bad thing, nice topic for future
keymap work. ;)
Probably nice to have in 2.79a.
===================================================================
M release/datafiles/locale
M release/scripts/addons
M release/scripts/addons_contrib
M source/blender/editors/object/object_ops.c
M source/tools
===================================================================
diff --git a/release/datafiles/locale b/release/datafiles/locale
index c93ed11a47b..b3d9c97f487 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit c93ed11a47b3016cf59711ec16de2e2e94c30e99
+Subproject commit b3d9c97f487bff8b2423c903c14204ba5ca21a83
diff --git a/release/scripts/addons b/release/scripts/addons
index 371960484a3..5b02e6e1acc 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 371960484a38fc64e0a2635170a41a0d8ab2f6bd
+Subproject commit 5b02e6e1acc4c3cf4822607ab33f48d7cffecbd3
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index a8515cfdfe9..c3991195ad6 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit a8515cfdfe9a98127b592f36fcbe51b7e23b969a
+Subproject commit c3991195ad6eac741db27dc9e8905efb224f219d
diff --git a/source/blender/editors/object/object_ops.c
b/source/blender/editors/object/object_ops.c
index 5fe5a884354..9b9f77a1dbb 100644
--- a/source/blender/editors/object/object_ops.c
+++ b/source/blender/editors/object/object_ops.c
@@ -374,13 +374,6 @@ void ED_keymap_object(wmKeyConfig *keyconf)
kmi = WM_keymap_add_item(keymap, "OBJECT_OT_scale_clear", SKEY,
KM_PRESS, KM_ALT, 0);
RNA_boolean_set(kmi->ptr, "clear_delta", false);
- kmi = WM_keymap_add_item(keymap, "OBJECT_OT_location_clear", GKEY,
KM_PRESS, KM_ALT | KM_SHIFT, 0);
- RNA_boolean_set(kmi->ptr, "clear_delta", true);
- kmi = WM_keymap_add_item(keymap, "OBJECT_OT_rotation_clear", RKEY,
KM_PRESS, KM_ALT | KM_SHIFT, 0);
- RNA_boolean_set(kmi->ptr, "clear_delta", true);
- kmi = WM_keymap_add_item(keymap, "OBJECT_OT_scale_clear", SKEY,
KM_PRESS, KM_ALT | KM_SHIFT, 0);
- RNA_boolean_set(kmi->ptr, "clear_delta", true);
-
WM_keymap_verify_item(keymap, "OBJECT_OT_origin_clear", OKEY, KM_PRESS,
KM_ALT, 0);
WM_keymap_add_item(keymap, "OBJECT_OT_hide_view_clear", HKEY, KM_PRESS,
KM_ALT, 0);
diff --git a/source/tools b/source/tools
index b11375e8906..9ea62ef860c 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit b11375e89061303401376f7aeae42ac2fd64692a
+Subproject commit 9ea62ef860cde8eb313b74cd1b23ca5a0734eefe
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
