[Bf-blender-cvs] [0f34796] pie-menus: * Move view pie to sticky space (to avoid clashes with many add-ons) * Fix naming

[Antony Riakiotakis]

Commit: 0f34796ed95d16865ee8d4537b4f43c877030f73
Author: Antony Riakiotakis
Date:   Wed Jul 30 14:55:58 2014 +0200
Branches: pie-menus
https://developer.blender.org/rB0f34796ed95d16865ee8d4537b4f43c877030f73

* Move view pie to sticky space (to avoid clashes with many add-ons)
* Fix naming

===================================================================

M	source/blender/editors/interface/interface_intern.h
M	source/blender/editors/space_view3d/view3d_ops.c

===================================================================

diff --git a/source/blender/editors/interface/interface_intern.h b/source/blender/editors/interface/interface_intern.h
index 4197589..5878bca 100644
--- a/source/blender/editors/interface/interface_intern.h
+++ b/source/blender/editors/interface/interface_intern.h
@@ -135,7 +135,7 @@ typedef enum RadialDirection {
 	UI_RADIAL_NW = 8
 } RadialDirection;
 
-extern const char ui_radial_dir_to_pad[8];
+extern const char ui_radial_dir_to_num[8];
 
 /* internal panel drawing defines */
 #define PNL_GRID    (UI_UNIT_Y / 5) /* 4 default */
diff --git a/source/blender/editors/space_view3d/view3d_ops.c b/source/blender/editors/space_view3d/view3d_ops.c
index f4f16d9..990675b 100644
--- a/source/blender/editors/space_view3d/view3d_ops.c
+++ b/source/blender/editors/space_view3d/view3d_ops.c
@@ -146,6 +146,17 @@ void ED_operatormacros_screen(void)
 		RNA_string_set(ptr, "value_2", "WIREFRAME");
 	}
 
+	ptr = WM_operator_pie_macro("VIEW3D_PIE_view_macro", "View",
+	                            "Set the shading mode for the 3D viewport",
+	                            OPTYPE_UNDO | OPTYPE_REGISTER, "WM_OT_context_toggle_enum", "VIEW3D_PIE_view");
+
+	if (ptr) {
+		RNA_string_set(ptr, "data_path", "space_data.viewport_shade");
+		RNA_string_set(ptr, "value_1", "SOLID");
+		RNA_string_set(ptr, "value_2", "RENDERED");
+	}
+
+
 	ptr = WM_operator_pie_macro("VIEW3D_PIE_manipulator_macro", "Manipulator",
 	                            "Manipulator Options for the viewport",
 	                            OPTYPE_UNDO | OPTYPE_REGISTER, "WM_OT_context_toggle", "VIEW3D_PIE_manipulator");
@@ -320,7 +331,7 @@ void view3d_keymap(wmKeyConfig *keyconf)
 	RNA_boolean_set(kmi->ptr, "center", true);
 
 	/* numpad view hotkeys*/
-	WM_keymap_add_pie_menu(keymap, "VIEW3D_PIE_view", QKEY, KM_PRESS, 0, 0, false);
+	WM_keymap_add_item(keymap, "VIEW3D_PIE_view_macro", SPACEKEY, KM_PRESS, 0, 0);
 
 	RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD0, KM_PRESS, 0, 0)->ptr, "type", RV3D_VIEW_CAMERA);
 	RNA_enum_set(WM_keymap_add_item(keymap, "VIEW3D_OT_viewnumpad", PAD1, KM_PRESS, 0, 0)->ptr, "type", RV3D_VIEW_FRONT);