Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-08-02 12:12:50 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-08-02 12:12:50 +0400
commit078dff64d2963e56675e490927d675c13626a956 (patch)
tree009d9dffd5c3ded934d977cf619e239767120882 /source/blender/editors/space_view3d/view3d_edit.c
parentd4a6884fcfbedcb1b13f65b071bfcf1e04f3ef9d (diff)
no functional changes.
style edits, also renamed ndof_to_angle_axis --> ndof_to_axis_angle
Diffstat (limited to 'source/blender/editors/space_view3d/view3d_edit.c')
-rw-r--r--source/blender/editors/space_view3d/view3d_edit.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index 8d77aeaea1b..e6fd9e8867b 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -930,7 +930,7 @@ void VIEW3D_OT_rotate(wmOperatorType *ot)
// NDOF utility functions
// (should these functions live in this file?)
-float ndof_to_angle_axis(struct wmNDOFMotionData* ndof, float axis[3])
+float ndof_to_axis_angle(struct wmNDOFMotionData* ndof, float axis[3])
{
return ndof->dt * normalize_v3_v3(axis, ndof->rvec);
}
@@ -940,7 +940,7 @@ void ndof_to_quat(struct wmNDOFMotionData* ndof, float q[4])
float axis[3];
float angle;
- angle= ndof_to_angle_axis(ndof, axis);
+ angle= ndof_to_axis_angle(ndof, axis);
axis_angle_to_quat(q, axis, angle);
}
@@ -1023,7 +1023,7 @@ static int ndof_orbit_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent *event
mul_qt_qtqt(rot, rot, view_inv_conj);
#else // ---------------------------------------- Mike's revised version
float axis[3];
- float angle = rot_sensitivity * ndof_to_angle_axis(ndof, axis);
+ float angle = rot_sensitivity * ndof_to_axis_angle(ndof, axis);
if (invert)
angle = -angle;