Commit: 94d8a5cfaf4762138a99756fdf5f33708b499ccc
Author: Bastien Montagne
Date: Fri Jan 9 10:51:21 2015 +0100
Branches: mesh-transfer-data
https://developer.blender.org/rB94d8a5cfaf4762138a99756fdf5f33708b499ccc
Fix shortcut confilct ('T' key is already quite used :/ ), add menu entries and
buttons in 3DView tools.
===================================================================
M release/scripts/startup/bl_ui/space_view3d.py
M release/scripts/startup/bl_ui/space_view3d_toolbar.py
M source/blender/editors/object/object_ops.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_view3d.py
b/release/scripts/startup/bl_ui/space_view3d.py
index 2e0bd0d..6bd2c4c 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -1096,6 +1096,7 @@ class VIEW3D_MT_object(Menu):
layout.operator("object.join")
layout.operator("object.data_transfer")
+ layout.operator("object.datalayout_transfer")
layout.separator()
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index b7fe9c6..7aa80bc 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -100,6 +100,13 @@ class VIEW3D_PT_tools_object(View3DPanel, Panel):
row.operator("object.shade_smooth", text="Smooth")
row.operator("object.shade_flat", text="Flat")
+ if obj_type in {'MESH'}:
+ col = layout.column(align=True)
+ col.label(text="Data Transfer:")
+ row = col.row(align=True)
+ row.operator("object.data_transfer", text="Data")
+ row.operator("object.datalayout_transfer", text="Data Layout")
+
class VIEW3D_PT_tools_add_object(View3DPanel, Panel):
bl_category = "Create"
diff --git a/source/blender/editors/object/object_ops.c
b/source/blender/editors/object/object_ops.c
index 6073f2b..5189594 100644
--- a/source/blender/editors/object/object_ops.c
+++ b/source/blender/editors/object/object_ops.c
@@ -423,8 +423,9 @@ void ED_keymap_object(wmKeyConfig *keyconf)
WM_keymap_add_menu(keymap, "VIEW3D_MT_object_specials", WKEY, KM_PRESS,
0, 0);
- WM_keymap_verify_item(keymap, "OBJECT_OT_data_transfer", TKEY,
KM_PRESS, KM_SHIFT, 0);
- WM_keymap_verify_item(keymap, "OBJECT_OT_datalayout_transfer", TKEY,
KM_PRESS, KM_SHIFT | KM_CTRL, 0);
+ WM_keymap_verify_item(keymap, "OBJECT_OT_data_transfer", TKEY,
KM_PRESS, KM_SHIFT | KM_CTRL, 0);
+ /* XXX No more available 'T' shortcuts... :/ */
+ /* WM_keymap_verify_item(keymap, "OBJECT_OT_datalayout_transfer", TKEY,
KM_PRESS, KM_SHIFT | KM_CTRL, 0); */
for (i = 0; i <= 5; i++) {
kmi = WM_keymap_add_item(keymap, "OBJECT_OT_subdivision_set",
ZEROKEY + i, KM_PRESS, KM_CTRL, 0);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
