[Bf-blender-cvs] [d00f636] pie-menus: Tweaks:

Antony Riakiotakis noreply at git.blender.org
Mon Jun 30 17:49:47 CEST 2014


Commit: d00f63627b3f18f341f199115566c80daec327a1
Author: Antony Riakiotakis
Date:   Mon Jun 30 18:49:39 2014 +0300
https://developer.blender.org/rBd00f63627b3f18f341f199115566c80daec327a1

Tweaks:

* Increase the animation timeout slightly
* Remove separator from shade menu.

Custom pies are really OK, but enums are somewhat problematic because
we don't have a way yet to explicitly set the ordering and positions
while expanding them. This is for immediate todo.

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

M	release/scripts/startup/bl_ui/space_view3d.py
M	source/blender/editors/interface/interface_handlers.c

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

diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index b0ba014..eea6604 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -1439,7 +1439,6 @@ class VIEW3D_PIE_shade(Menu):
 
         pie = layout.menu_pie()
         pie.prop(context.space_data, "viewport_shade", expand=True)
-        pie.separator()
 
         if context.active_object:
             if(context.mode == 'EDIT_MESH'):
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index 22e4b86..050a83e 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -8451,7 +8451,7 @@ static int ui_handler_pie(bContext *C, const wmEvent *event, uiPopupBlockHandle
 			/* handle animation */
 			if (!(block->pie_data.flags & UI_PIE_ANIMATION_FINISHED)) {
 				uiBut *but;
-				double final_time = 0.08;
+				double final_time = 0.12;
 				float fac = duration / final_time;
 
 				if (fac > 1.0f) {




More information about the Bf-blender-cvs mailing list