diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-04-27 23:48:23 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-04-27 23:49:52 +0300 |
commit | c42a47d177e97e8f799f880a2f364b0f44389a32 (patch) | |
tree | c1e7db5a7ae07f187940c99f343943e503cd7047 /source/blender/editors | |
parent | bb513b173e9bb6f1c0db6af66a548ef4883fa0f3 (diff) |
UI: add new transform tool that enables all widgets
Also add bevel tool.
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/datafiles/CMakeLists.txt | 8 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_manipulator.c | 5 |
2 files changed, 9 insertions, 4 deletions
diff --git a/source/blender/editors/datafiles/CMakeLists.txt b/source/blender/editors/datafiles/CMakeLists.txt index 9927d25bd80..aabe756c928 100644 --- a/source/blender/editors/datafiles/CMakeLists.txt +++ b/source/blender/editors/datafiles/CMakeLists.txt @@ -540,7 +540,11 @@ set_property(GLOBAL PROPERTY ICON_GEOM_NAMES ops.gpencil.draw.eraser ops.gpencil.draw.line ops.gpencil.draw.poly + ops.mesh.bevel ops.mesh.bisect + ops.mesh.dupli_extrude_cursor + ops.mesh.extrude_faces_move + ops.mesh.extrude_region_move ops.mesh.inset ops.mesh.knife_tool ops.mesh.loopcut_slide @@ -564,12 +568,10 @@ set_property(GLOBAL PROPERTY ICON_GEOM_NAMES ops.transform.resize ops.transform.rotate ops.transform.shrink_fatten + ops.transform.transform ops.transform.translate ops.transform.vert_slide ops.transform.vertex_random - ops.view3d.edit_mesh_extrude - ops.view3d.edit_mesh_extrude_cursor - ops.view3d.edit_mesh_extrude_individual ops.view3d.ruler # END ICON_GEOM_NAMES ) diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c index d8d7573f818..eea306c7ff0 100644 --- a/source/blender/editors/transform/transform_manipulator.c +++ b/source/blender/editors/transform/transform_manipulator.c @@ -1289,7 +1289,10 @@ static void WIDGETGROUP_manipulator_setup(const bContext *C, wmManipulatorGroup /* Weak, check first event */ wmKeyMapItem *kmi = km->items.first; - if (STREQ(kmi->idname, "TRANSFORM_OT_translate")) { + if (kmi == NULL) { + man->twtype |= V3D_MANIP_TRANSLATE | V3D_MANIP_ROTATE | V3D_MANIP_SCALE; + } + else if (STREQ(kmi->idname, "TRANSFORM_OT_translate")) { man->twtype |= V3D_MANIP_TRANSLATE; } else if (STREQ(kmi->idname, "TRANSFORM_OT_rotate")) { |