[Bf-blender-cvs] [8223533] wiggly-widgets: Cleanup: Style

Julian Eisel noreply at git.blender.org
Tue Feb 9 20:41:42 CET 2016


Commit: 8223533589fb9e7c1f1533df618476ecd978f536
Author: Julian Eisel
Date:   Tue Feb 9 20:41:01 2016 +0100
Branches: wiggly-widgets
https://developer.blender.org/rB8223533589fb9e7c1f1533df618476ecd978f536

Cleanup: Style

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

M	source/blender/windowmanager/widgets/WM_widget_library.h
M	source/blender/windowmanager/widgets/intern/widget_library/arrow_widget.c
M	source/blender/windowmanager/widgets/intern/widget_library/cage_widget.c
M	source/blender/windowmanager/widgets/intern/wm_widgetmap.c

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

diff --git a/source/blender/windowmanager/widgets/WM_widget_library.h b/source/blender/windowmanager/widgets/WM_widget_library.h
index 65a3547..b3a23e4 100644
--- a/source/blender/windowmanager/widgets/WM_widget_library.h
+++ b/source/blender/windowmanager/widgets/WM_widget_library.h
@@ -20,7 +20,7 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-/** \file blender/windowmanager/widgets/widget_library/WM_widget_library.h
+/** \file blender/windowmanager/widgets/WM_widget_library.h
  *  \ingroup wm
  *
  * \name Generic Widget Library
diff --git a/source/blender/windowmanager/widgets/intern/widget_library/arrow_widget.c b/source/blender/windowmanager/widgets/intern/widget_library/arrow_widget.c
index e379a33..ef76357 100644
--- a/source/blender/windowmanager/widgets/intern/widget_library/arrow_widget.c
+++ b/source/blender/windowmanager/widgets/intern/widget_library/arrow_widget.c
@@ -321,9 +321,9 @@ static int widget_arrow_handler(bContext *C, const wmEvent *event, wmWidget *wid
 	if (RAD2DEG(acos(dot_v3v3(viewvec, arrow->direction))) > 5.0f) {
 		/* multiply to projection space */
 		mul_m4_v4(rv3d->persmat, orig_origin);
-		mul_v4_fl(orig_origin, 1.0f/orig_origin[3]);
+		mul_v4_fl(orig_origin, 1.0f / orig_origin[3]);
 		mul_m4_v4(rv3d->persmat, offset);
-		mul_v4_fl(offset, 1.0f/offset[3]);
+		mul_v4_fl(offset, 1.0f / offset[3]);
 
 		sub_v2_v2v2(dir_2d, offset, orig_origin);
 		dir_2d[0] *= ar->winx;
diff --git a/source/blender/windowmanager/widgets/intern/widget_library/cage_widget.c b/source/blender/windowmanager/widgets/intern/widget_library/cage_widget.c
index bc2a09c..9d1667a 100644
--- a/source/blender/windowmanager/widgets/intern/widget_library/cage_widget.c
+++ b/source/blender/windowmanager/widgets/intern/widget_library/cage_widget.c
@@ -253,7 +253,7 @@ static int widget_rect_transform_intersect(bContext *UNUSED(C), const wmEvent *e
 	//rotate_m2(matrot, -cage->transform.rotation);
 
 	if (cage->style & WIDGET_RECT_TRANSFORM_STYLE_SCALE_UNIFORM)
-		mul_v2_fl(point_local, 1.0f/cage->scale[0]);
+		mul_v2_fl(point_local, 1.0f / cage->scale[0]);
 	else {
 		point_local[0] /= cage->scale[0];
 		point_local[1] /= cage->scale[0];
@@ -369,7 +369,7 @@ static bool widget_rect_transform_get_property(wmWidget *widget, const int slot,
 static int widget_rect_transform_invoke(bContext *UNUSED(C), const wmEvent *event, wmWidget *widget)
 {
 	RectTransformWidget *cage = (RectTransformWidget *)widget;
-	RectTransformInteraction *data = MEM_callocN(sizeof (RectTransformInteraction), "cage_interaction");
+	RectTransformInteraction *data = MEM_callocN(sizeof(RectTransformInteraction), "cage_interaction");
 
 	copy_v2_v2(data->orig_offset, widget->offset);
 	copy_v2_v2(data->orig_scale, cage->scale);
@@ -459,7 +459,7 @@ static int widget_rect_transform_handler(bContext *C, const wmEvent *event, wmWi
 		PointerRNA ptr = widget->ptr[RECT_TRANSFORM_SLOT_SCALE];
 		PropertyRNA *prop = widget->props[RECT_TRANSFORM_SLOT_SCALE];
 
-		if (cage->style & WIDGET_RECT_TRANSFORM_STYLE_SCALE_UNIFORM){
+		if (cage->style & WIDGET_RECT_TRANSFORM_STYLE_SCALE_UNIFORM) {
 			RNA_property_float_set(&ptr, prop, cage->scale[0]);
 		}
 		else {
@@ -504,7 +504,7 @@ static void widget_rect_transform_exit(bContext *C, wmWidget *widget, const bool
 		PointerRNA ptr = widget->ptr[RECT_TRANSFORM_SLOT_SCALE];
 		PropertyRNA *prop = widget->props[RECT_TRANSFORM_SLOT_SCALE];
 
-		if (cage->style & WIDGET_RECT_TRANSFORM_STYLE_SCALE_UNIFORM){
+		if (cage->style & WIDGET_RECT_TRANSFORM_STYLE_SCALE_UNIFORM) {
 			RNA_property_float_set(&ptr, prop, data->orig_scale[0]);
 		}
 		else {
diff --git a/source/blender/windowmanager/widgets/intern/wm_widgetmap.c b/source/blender/windowmanager/widgets/intern/wm_widgetmap.c
index a49ca9f..028ca90 100644
--- a/source/blender/windowmanager/widgets/intern/wm_widgetmap.c
+++ b/source/blender/windowmanager/widgets/intern/wm_widgetmap.c
@@ -461,6 +461,7 @@ bool WM_widgetmap_select_all(bContext *C, wmWidgetMap *wmap, const int action)
 			break;
 		default:
 			BLI_assert(0);
+			break;
 	}
 
 	if (changed)




More information about the Bf-blender-cvs mailing list