[Bf-blender-cvs] [63eeb6b] wiggly-widgets: Minor corrections to previous commit

[Julian Eisel]

Commit: 63eeb6bc887ddcd235389d42d75a27180b0de82a
Author: Julian Eisel
Date:   Mon Sep 14 23:57:43 2015 +0200
Branches: wiggly-widgets
https://developer.blender.org/rB63eeb6bc887ddcd235389d42d75a27180b0de82a

Minor corrections to previous commit

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

M       source/blender/editors/transform/transform_manipulator.c
M       source/blender/windowmanager/WM_api.h
M       source/blender/windowmanager/intern/wm_generic_widgets.c

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

diff --git a/source/blender/editors/transform/transform_manipulator.c 
b/source/blender/editors/transform/transform_manipulator.c
index c39268f..dc45992 100644
--- a/source/blender/editors/transform/transform_manipulator.c
+++ b/source/blender/editors/transform/transform_manipulator.c
@@ -1144,7 +1144,7 @@ void WIDGETGROUP_manipulator_create(const struct bContext 
*C, struct wmWidgetGro
                        case MAN_AXIS_ROT_Y:
                        case MAN_AXIS_ROT_Z:
                                WM_widget_set_line_width(axis, 
MAN_AXIS_LINE_WIDTH);
-                               WIDGET_dial_set_up_vec(axis, 
rv3d->twmat[aidx_norm]);
+                               WIDGET_dial_set_up_vector(axis, 
rv3d->twmat[aidx_norm]);
                                break;
                        case MAN_AXIS_TRANS_XY:
                        case MAN_AXIS_TRANS_YZ:
@@ -1173,7 +1173,7 @@ void WIDGETGROUP_manipulator_create(const struct bContext 
*C, struct wmWidgetGro
                                if (axis_idx != MAN_AXIS_ROT_C) {
                                        WM_widget_set_scale(axis, 0.2f);
                                }
-                               WIDGET_dial_set_up_vec(axis, rv3d->viewinv[2]);
+                               WIDGET_dial_set_up_vector(axis, 
rv3d->viewinv[2]);
                                break;
                }
 
diff --git a/source/blender/windowmanager/WM_api.h 
b/source/blender/windowmanager/WM_api.h
index 9a08316..647db0e 100644
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@ -585,7 +585,7 @@ void WIDGET_arrow_set_ui_range(struct wmWidget *widget, 
const float min, const f
 void WIDGET_arrow_set_range_fac(struct wmWidget *widget, const float 
range_fac);
 
 struct wmWidget *WIDGET_dial_new(struct wmWidgetGroup *wgroup, const char 
*name, const int style);
-void WIDGET_dial_set_up_vec(struct wmWidget *widget, const float direction[3]);
+void WIDGET_dial_set_up_vector(struct wmWidget *widget, const float 
direction[3]);
 
 struct wmWidget *WIDGET_plane_new(struct wmWidgetGroup *wgroup, const char 
*name, const int style);
 void WIDGET_plane_set_direction(struct wmWidget *widget, const float 
direction[3]);
diff --git a/source/blender/windowmanager/intern/wm_generic_widgets.c 
b/source/blender/windowmanager/intern/wm_generic_widgets.c
index 32c0ce8..2a24fb1 100644
--- a/source/blender/windowmanager/intern/wm_generic_widgets.c
+++ b/source/blender/windowmanager/intern/wm_generic_widgets.c
@@ -153,6 +153,7 @@ static void widget_draw_intern(WidgetDrawInfo *info, const 
bool select)
        }
 }
 
+
 /* -------------------------------------------------------------------- */
 /* Widget defines */
 
@@ -866,7 +867,7 @@ wmWidget *WIDGET_dial_new(wmWidgetGroup *wgroup, const char 
*name, const int sty
 /**
  * Define up-direction of the dial widget
  */
-void WIDGET_dial_set_up_vec(wmWidget *widget, const float direction[3])
+void WIDGET_dial_set_up_vector(wmWidget *widget, const float direction[3])
 {
        DialWidget *dial = (DialWidget *)widget;
 
@@ -1585,6 +1586,8 @@ wmWidget *WIDGET_facemap_new(
 /** \} */ // Facemap Widget
 
 
+/* -------------------------------------------------------------------- */
+
 void fix_linking_widget_lib(void)
 {
        (void) 0;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs