[Bf-blender-cvs] [09977b4] pie-menus: Pie Menus:

Antony Riakiotakis noreply at git.blender.org
Mon Jul 28 16:19:30 CEST 2014


Commit: 09977b40c4c067faa600394aed5dacb4af201d19
Author: Antony Riakiotakis
Date:   Mon Jul 28 16:15:17 2014 +0200
Branches: pie-menus
https://developer.blender.org/rB09977b40c4c067faa600394aed5dacb4af201d19

Pie Menus:

* Do not recenter items for animation if animation timeout is zero. Avoids
flickering at start of animation

* Initialize pies with invalid direction

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

M	source/blender/editors/interface/interface_regions.c

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

diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c
index cc18e73..9143116 100644
--- a/source/blender/editors/interface/interface_regions.c
+++ b/source/blender/editors/interface/interface_regions.c
@@ -1743,10 +1743,14 @@ uiBlock *ui_popup_block_refresh(
 			block->pie_data.flags |= UI_PIE_INITIAL_DIRECTION;
 		}
 
+		block->pie_data.flags |= UI_PIE_INVALID_DIR;
+
 		/* lastly set the buttons at the center of the pie menu, ready for animation */
-		for (but = block->buttons.first; but; but = but->next) {
-			if (but->pie_dir) {
-				BLI_rctf_recenter(&but->rect, block->pie_data.pie_center_spawned[0], block->pie_data.pie_center_spawned[1]);
+		if (U.pie_animation_timeout > 0) {
+			for (but = block->buttons.first; but; but = but->next) {
+				if (but->pie_dir) {
+					BLI_rctf_recenter(&but->rect, block->pie_data.pie_center_spawned[0], block->pie_data.pie_center_spawned[1]);
+				}
 			}
 		}
 	}




More information about the Bf-blender-cvs mailing list