[Bf-blender-cvs] [a8225f2] wiggly-widgets: Minor Cleanup

[Julian Eisel]

Commit: a8225f2ffdf17bb4e76c2184b1f252df9052551e
Author: Julian Eisel
Date:   Fri Jul 24 14:59:19 2015 +0200
Branches: wiggly-widgets
https://developer.blender.org/rBa8225f2ffdf17bb4e76c2184b1f252df9052551e

Minor Cleanup

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

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 d07a8d5..726e220 100644
--- a/source/blender/windowmanager/intern/wm_widgets.c
+++ b/source/blender/windowmanager/intern/wm_widgets.c
@@ -234,20 +234,20 @@ static void wm_widget_delete(ListBase *widgetlist, wmWidget *widget)
 
 static void widget_calculate_scale(wmWidget *widget, const bContext *C)
 {
+	const RegionView3D *rv3d = CTX_wm_region_view3d(C);
 	float scale = 1.0f;
-	RegionView3D *rv3d = CTX_wm_region_view3d(C);
 
-	if (rv3d && !(U.tw_flag & V3D_3D_WIDGETS) && (widget->flag & WM_WIDGET_SCALE_3D)) {
+	if (rv3d && (U.tw_flag & V3D_3D_WIDGETS) == 0 && (widget->flag & WM_WIDGET_SCALE_3D)) {
 		ED_view3d_update_viewmat(CTX_data_scene(C), CTX_wm_view3d(C), CTX_wm_region(C), NULL, NULL);
 
 		if (widget->get_final_position) {
 			float position[3];
 
 			widget->get_final_position(widget, position);
-			scale = ED_view3d_pixel_size(rv3d, position) * U.tw_size;
+			scale = ED_view3d_pixel_size(rv3d, position) * (float)U.tw_size;
 		}
 		else {
-			scale = ED_view3d_pixel_size(rv3d, widget->origin) * U.tw_size;
+			scale = ED_view3d_pixel_size(rv3d, widget->origin) * (float)U.tw_size;
 		}
 	}