[Bf-blender-cvs] [fcfc7bf] wiggly-widgets: Skip hidden widgets when updating widget size

Julian Eisel noreply at git.blender.org
Tue Nov 24 16:28:01 CET 2015


Commit: fcfc7bf22bbb01116a58c7c2f6ed1566254e11fa
Author: Julian Eisel
Date:   Tue Nov 24 16:27:01 2015 +0100
Branches: wiggly-widgets
https://developer.blender.org/rBfcfc7bf22bbb01116a58c7c2f6ed1566254e11fa

Skip hidden widgets when updating widget size

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

M	source/blender/windowmanager/intern/wm_widgets.c

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

diff --git a/source/blender/windowmanager/intern/wm_widgets.c b/source/blender/windowmanager/intern/wm_widgets.c
index ddc914f..0ffd4f1 100644
--- a/source/blender/windowmanager/intern/wm_widgets.c
+++ b/source/blender/windowmanager/intern/wm_widgets.c
@@ -277,7 +277,9 @@ void WM_widgets_update(const bContext *C, wmWidgetMap *wmap)
 		return;
 
 	if (widget) {
-		widget_calculate_scale(widget, C);
+		if ((widget->flag & WM_WIDGET_HIDDEN) == 0) {
+			widget_calculate_scale(widget, C);
+		}
 	}
 	else if (wmap->widgetgroups.first) {
 		GHash *hash = BLI_ghash_str_new(__func__);
@@ -330,6 +332,8 @@ void WM_widgets_update(const bContext *C, wmWidgetMap *wmap)
 				}
 
 				for (widget = wgroup->widgets.first; widget; widget = widget->next) {
+					if (widget->flag & WM_WIDGET_HIDDEN)
+						continue;
 					widget_calculate_scale(widget, C);
 					/* insert newly created widget into hash table */
 					BLI_ghash_insert(hash, widget->idname, widget);




More information about the Bf-blender-cvs mailing list