[Bf-blender-cvs] [989bdf6] pie-menus: Rename layout.pie to menu_pie

Campbell Barton noreply at git.blender.org
Sun Jun 15 09:00:10 CEST 2014


Commit: 989bdf6748b4f81d75c05d740d200dfc5fd8f2c5
Author: Campbell Barton
Date:   Sun Jun 15 16:59:36 2014 +1000
https://developer.blender.org/rB989bdf6748b4f81d75c05d740d200dfc5fd8f2c5

Rename layout.pie to menu_pie

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

M	release/scripts/modules/bpy_types.py
M	release/scripts/startup/bl_operators/wm.py
M	release/scripts/startup/bl_ui/space_view3d_toolbar.py
M	source/blender/makesrna/intern/rna_ui_api.c
M	source/blender/makesrna/intern/rna_wm_api.c

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

diff --git a/release/scripts/modules/bpy_types.py b/release/scripts/modules/bpy_types.py
index e6e6de9..3114291 100644
--- a/release/scripts/modules/bpy_types.py
+++ b/release/scripts/modules/bpy_types.py
@@ -140,7 +140,7 @@ class WindowManager(bpy_types.ID):
         finally:
             self.pupmenu_end__internal(popup)
 
-    def pie_menu(self, event, draw_func, title="", icon='NONE'):
+    def menu_pie(self, event, draw_func, title="", icon='NONE'):
         import bpy
         pie = self.piemenu_begin__internal(title, icon, event.type)
 
diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py
index 885254a..e1549fc 100644
--- a/release/scripts/startup/bl_operators/wm.py
+++ b/release/scripts/startup/bl_operators/wm.py
@@ -553,7 +553,7 @@ class WM_OT_context_operator_pie_enum(Operator):
             layout = self.layout
             layout.operator_enum(op_idname, property)
 
-        context.window_manager.pie_menu(draw_func=draw_cb, title=self.title, event=event)
+        context.window_manager.menu_pie(draw_func=draw_cb, title=self.title, event=event)
 
         return {'FINISHED'}
 
@@ -579,7 +579,7 @@ class WM_OT_context_pie_enum(Operator):
             layout = self.layout
             layout.prop(value_base, prop_string, expand=True)
 
-        context.window_manager.pie_menu(draw_func=draw_cb, title=prop.name, icon=prop.icon, event=event)
+        context.window_manager.menu_pie(draw_func=draw_cb, title=prop.name, icon=prop.icon, event=event)
 
         return {'FINISHED'}
 
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 7699257..fe8e7d4 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -1703,7 +1703,7 @@ class VIEW3D_PIE_tests(Menu):
         sculpt = toolsettings.sculpt
         brush = sculpt.brush
 
-        pie = layout.pie()
+        pie = layout.menu_pie()
         pie.prop(sculpt, "use_symmetry_feather", toggle=True)
         pie.prop(brush, "strength")
 
diff --git a/source/blender/makesrna/intern/rna_ui_api.c b/source/blender/makesrna/intern/rna_ui_api.c
index fe166bf..ce68e5f 100644
--- a/source/blender/makesrna/intern/rna_ui_api.c
+++ b/source/blender/makesrna/intern/rna_ui_api.c
@@ -463,7 +463,7 @@ void RNA_api_ui_layout(StructRNA *srna)
 	RNA_def_boolean(func, "align", false, "", "Align buttons to each other");
 
 	/* radial/pie layout */
-	func = RNA_def_function(srna, "pie", "uiLayoutRadial");
+	func = RNA_def_function(srna, "menu_pie", "uiLayoutRadial");
 	parm = RNA_def_pointer(func, "layout", "UILayout", "", "Sub-layout to put items in");
 	RNA_def_function_return(func, parm);
 	RNA_def_function_ui_description(func, "Sublayout. Items placed in this sublayout are placed "
diff --git a/source/blender/makesrna/intern/rna_wm_api.c b/source/blender/makesrna/intern/rna_wm_api.c
index b919e4c..344d8b5 100644
--- a/source/blender/makesrna/intern/rna_wm_api.c
+++ b/source/blender/makesrna/intern/rna_wm_api.c
@@ -490,7 +490,7 @@ void RNA_api_wm(StructRNA *srna)
 	parm = RNA_def_property(func, "type", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_items(parm, event_type_items);
 	/* return */
-	parm = RNA_def_pointer(func, "pie", "UIPieMenu", "", "");
+	parm = RNA_def_pointer(func, "menu_pie", "UIPieMenu", "", "");
 	RNA_def_property_flag(parm, PROP_RNAPTR | PROP_NEVER_NULL);
 	RNA_def_function_return(func, parm);




More information about the Bf-blender-cvs mailing list