[Bf-blender-cvs] [8323d88] pie-menus: According to final verdict:
Antony Riakiotakis
noreply at git.blender.org
Thu Aug 7 11:55:12 CEST 2014
Commit: 8323d88ef8d2394993e89b1ba40be9835230607d
Author: Antony Riakiotakis
Date: Thu Aug 7 11:01:14 2014 +0200
Branches: pie-menus
https://developer.blender.org/rB8323d88ef8d2394993e89b1ba40be9835230607d
According to final verdict:
* Remove sticky keys
* Remove all pie menus
Left some icon changes to some properties and some reordering of enums
to look better for pie menus (Might go away in a later iteration).
Some pies will make it back as an Add-On (will be a separate commit)
===================================================================
M release/scripts/startup/bl_ui/space_userpref.py
M release/scripts/startup/bl_ui/space_view3d.py
M source/blender/editors/include/ED_view3d.h
M source/blender/editors/interface/resources.c
M source/blender/editors/mesh/mesh_ops.c
M source/blender/editors/object/object_ops.c
M source/blender/editors/sculpt_paint/paint_ops.c
M source/blender/editors/space_api/spacetypes.c
M source/blender/editors/space_view3d/view3d_ops.c
M source/blender/makesdna/DNA_userdef_types.h
M source/blender/makesrna/intern/rna_space.c
M source/blender/makesrna/intern/rna_userdef.c
M source/blender/windowmanager/WM_api.h
M source/blender/windowmanager/intern/wm_event_system.c
M source/blender/windowmanager/intern/wm_operators.c
M source/blender/windowmanager/wm.h
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index 98f391c..999e41e 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -219,7 +219,6 @@ class USERPREF_PT_interface(Panel):
col.separator()
col.label(text="Pie Menus:")
sub = col.column(align=True)
- sub.prop(view, "pie_operator_timeout")
sub.prop(view, "pie_animation_timeout")
sub.prop(view, "pie_initial_timeout")
sub.prop(view, "pie_menu_radius")
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index fdd4ac8..1079c50 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -1411,70 +1411,6 @@ class VIEW3D_MT_object_game(Menu):
layout.operator("object.game_property_clear")
-class VIEW3D_PIE_view(Menu):
- bl_label = "View"
-
- def draw(self, context):
- layout = self.layout
-
- pie = layout.menu_pie()
- pie.operator_enum("VIEW3D_OT_viewnumpad", "type")
- pie.operator("VIEW3D_OT_view_persportho", text="Persp/Ortho", icon='RESTRICT_VIEW_OFF')
-
-
-class VIEW3D_PIE_shade(Menu):
- bl_label = "Shade"
-
- def draw(self, context):
- layout = self.layout
-
- pie = layout.menu_pie()
- pie.prop(context.space_data, "viewport_shade_pie", expand=True)
-
- if context.active_object:
- if(context.mode == 'EDIT_MESH'):
- pie.operator("MESH_OT_faces_shade_smooth")
- pie.operator("MESH_OT_faces_shade_flat")
- else:
- pie.operator("OBJECT_OT_shade_smooth")
- pie.operator("OBJECT_OT_shade_flat")
-
-
-class VIEW3D_PIE_manipulator(Menu):
- bl_label = "Manipulator"
-
- def draw(self, context):
- layout = self.layout
-
- pie = layout.menu_pie()
- pie.prop(context.space_data, "transform_manipulators", expand=True)
- pie.prop(context.space_data, "show_manipulator")
-
-
-class VIEW3D_PIE_pivot(Menu):
- bl_label = "Pivot"
-
- def draw(self, context):
- layout = self.layout
-
- pie = layout.menu_pie()
- pie.prop(context.space_data, "pivot_point", expand=True)
- if context.active_object.mode == 'OBJECT':
- pie.prop(context.space_data, "use_pivot_point_align", text="Center Points")
-
-
-class VIEW3D_PIE_snap(Menu):
- bl_label = "Snapping"
-
- def draw(self, context):
- layout = self.layout
-
- toolsettings = context.tool_settings
- pie = layout.menu_pie()
- pie.prop(toolsettings, "snap_element", expand=True)
- pie.prop(toolsettings, "use_snap")
-
-
# ********** Brush menu **********
class VIEW3D_MT_brush(Menu):
bl_label = "Brush"
@@ -2214,55 +2150,6 @@ class VIEW3D_MT_edit_mesh_extrude(Menu):
self._extrude_funcs[menu_id](layout)
-class VIEW3D_MT_edit_mesh_extrude_pie(Menu):
- bl_label = "Extrude"
-
- _extrude_funcs = {
- 'VERT': lambda layout:
- layout.operator("mesh.extrude_vertices_move", text="Vertices Only"),
- 'EDGE': lambda layout:
- layout.operator("mesh.extrude_edges_move", text="Edges Only"),
- 'FACE': lambda layout:
- layout.operator("mesh.extrude_faces_move", text="Individual Faces"),
- 'REGION': lambda layout:
- layout.operator("view3d.edit_mesh_extrude_move_normal", text="Region"),
- 'REGION_VERT_NORMAL': lambda layout:
- layout.operator("view3d.edit_mesh_extrude_move_shrink_fatten", text="Region (Vertex Normals)"),
- 'NULL': lambda layout:
- layout.separator(),
- }
-
- @staticmethod
- def extrude_options(context):
- mesh = context.object.data
- select_mode = context.tool_settings.mesh_select_mode
-
- menu = []
- if mesh.total_face_sel:
- menu += ['REGION', 'REGION_VERT_NORMAL', 'FACE']
- else:
- menu += ['NULL', 'NULL', 'NULL']
- if mesh.total_edge_sel and (select_mode[0] or select_mode[1]):
- menu += ['EDGE']
- else:
- menu += ['NULL']
- if mesh.total_vert_sel and select_mode[0]:
- menu += ['VERT']
- else:
- menu += ['NULL']
-
- # should never get here
- return menu
-
- def draw(self, context):
- layout = self.layout
- layout.operator_context = 'INVOKE_REGION_WIN'
- pie = layout.menu_pie()
-
- for menu_id in self.extrude_options(context):
- self._extrude_funcs[menu_id](pie)
-
-
class VIEW3D_MT_edit_mesh_vertices(Menu):
bl_label = "Vertices"
diff --git a/source/blender/editors/include/ED_view3d.h b/source/blender/editors/include/ED_view3d.h
index 89f168c..430c804 100644
--- a/source/blender/editors/include/ED_view3d.h
+++ b/source/blender/editors/include/ED_view3d.h
@@ -356,8 +356,6 @@ float ED_view3d_grid_scale(struct Scene *scene, struct View3D *v3d, const char *
void ED_scene_draw_fps(struct Scene *scene, const struct rcti *rect);
-void ED_operatormacros_view3d(void);
-
/* view matrix properties utilities */
/* unused */
#if 0
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c
index dcc06e7..efcc958 100644
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@ -2472,7 +2472,6 @@ void init_userdef_do_versions(void)
U.pie_menu_radius = 150;
U.pie_menu_threshold = 12;
- U.pie_operator_timeout = 20;
U.pie_animation_timeout = 6;
for (btheme = U.themes.first; btheme; btheme = btheme->next) {
diff --git a/source/blender/editors/mesh/mesh_ops.c b/source/blender/editors/mesh/mesh_ops.c
index 6ddfefa..55dd97d 100644
--- a/source/blender/editors/mesh/mesh_ops.c
+++ b/source/blender/editors/mesh/mesh_ops.c
@@ -282,11 +282,6 @@ void ED_operatormacros_mesh(void)
otmacro = WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate");
RNA_enum_set(otmacro->ptr, "proportional", 0);
RNA_boolean_set(otmacro->ptr, "mirror", false);
-
- WM_operator_pie_macro("VIEW3D_OT_edit_mesh_extrude_sticky", "Extrude Sticky",
- "Extrude the mesh surface",
- OPTYPE_UNDO | OPTYPE_REGISTER, "VIEW3D_OT_edit_mesh_extrude_move_normal", /* python operator */
- "VIEW3D_MT_edit_mesh_extrude_pie");
}
/* note mesh keymap also for other space? */
@@ -364,8 +359,8 @@ void ED_keymap_mesh(wmKeyConfig *keyconf)
kmi = WM_keymap_add_item(keymap, "MESH_OT_normals_make_consistent", NKEY, KM_PRESS, KM_SHIFT | KM_CTRL, 0);
RNA_boolean_set(kmi->ptr, "inside", true);
+ WM_keymap_add_item(keymap, "VIEW3D_OT_edit_mesh_extrude_move_normal", EKEY, KM_PRESS, 0, 0); /* python operator */
WM_keymap_add_menu(keymap, "VIEW3D_MT_edit_mesh_extrude", EKEY, KM_PRESS, KM_ALT, 0);
- WM_keymap_add_item(keymap, "VIEW3D_OT_edit_mesh_extrude_sticky", EKEY, KM_PRESS, 0, 0);
WM_keymap_add_item(keymap, "TRANSFORM_OT_edge_crease", EKEY, KM_PRESS, KM_SHIFT, 0);
diff --git a/source/blender/editors/object/object_ops.c b/source/blender/editors/object/object_ops.c
index b205980..a8f0774 100644
--- a/source/blender/editors/object/object_ops.c
+++ b/source/blender/editors/object/object_ops.c
@@ -253,8 +253,7 @@ void ED_operatormacros_object(void)
{
wmOperatorType *ot;
wmOperatorTypeMacro *otmacro;
- PointerRNA *ptr;
-
+
ot = WM_operatortype_append_macro("OBJECT_OT_duplicate_move", "Duplicate Objects",
"Duplicate selected objects and move them", OPTYPE_UNDO | OPTYPE_REGISTER);
if (ot) {
@@ -272,27 +271,7 @@ void ED_operatormacros_object(void)
otmacro = WM_operatortype_macro_define(ot, "TRANSFORM_OT_translate");
RNA_enum_set(otmacro->ptr, "proportional", PROP_EDIT_OFF);
}
-
- ptr = WM_operator_property_pie_macro("OBJECT_OT_pie_mode_set", "Set Mode",
- "Set the mode of interaction for the selected object",
- OPTYPE_UNDO | OPTYPE_REGISTER, "Interaction Mode",
- "OBJECT_OT_mode_set", "mode");
-
- if (ptr) {
- RNA_enum_set(ptr, "mode", OB_MODE_EDIT);
- RNA_boolean_set(ptr, "toggle", true);
- }
-
- ptr = WM_operator_enum_pie_macro("WM_OT_proportional_mode_sticky", "Proportional Mode Sticky",
- "Set the mode of interaction for the proportional editing",
- OPTYPE_UNDO | OPTYPE_REGISTER, "Proportional Mode",
- "WM_OT_context_toggle_enum", "tool_settings.proportional_edit");
-
- if (ptr) {
- RNA_string_set(ptr, "data_path", "tool_settings.proportional_edit");
- RNA_string_set(ptr, "value_1", "DISABLED");
- RNA_string_set(ptr, "value_2", "ENABLED");
- }
+
}
static int object_mode_poll(bContext *C)
@@ -309,8 +288,11 @@ void ED_keymap_object(wmKeyConfig *keyconf)
/* Objects, Regardless of Mode -------------------------------------------------- */
keymap = WM_keymap_find(keyconf, "Object Non-modal", 0, 0);
-
- kmi = WM_keymap_add_item(keymap, "OBJECT_OT_pie_mode_set", TABKEY, KM_PRESS, 0, 0);
+
+ /* Note: this keymap works disregarding mode */
+ kmi = WM_keymap_add_item(keymap, "OBJECT_OT_mode_set", TABKEY, KM_PRESS, 0, 0);
+ RNA_enum_set(kmi->ptr, "mode", OB_MODE_EDIT);
+ RNA_boolean_set(kmi->ptr, "toggle", true);
kmi = WM_keymap_add_item(keymap, "OBJECT_OT_mode_set", TABKEY, KM_PRESS, KM_CTRL, 0);
RNA_enum_set(kmi->ptr, "mode", OB_MODE_POSE);
@@ -322,8 +304,8 @@ void ED_keymap_object(wmKeyConfig *keyconf)
kmi = WM_keymap_add_item(keymap, "OBJECT_OT_mode_set", TABKEY, KM_PRESS, KM_CTRL, 0);
RNA_enum_set(kmi->ptr, "mode", OB_MODE_WEIGHT_PAINT);
- RNA_boolean_set(kmi->ptr, "toggle", true);
-
+ RNA_boolean_set(kmi->ptr, "toggle", true);
+
WM_keymap_add_item(keymap, "OBJECT_OT_origin_set", CKEY, KM_PRESS, KM_ALT | KM_SHIFT | KM_CTRL, 0);
/* Object Mode ---------------------------------------------------------------- */
@@ -494,7 +476,10 @@ void ED_keymap_proportional_editmode(struct wmKeyCo
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list