diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-05-20 17:09:34 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-05-20 17:09:34 +0400 |
| commit | 53d5761c94b3ff561ecfd1edd0c97ffde62f0215 (patch) | |
| tree | 3210ca9dc6cf56460171e55c8595aed1ac79bd62 /source/blender/editors/transform | |
| parent | e721d31b5d1ede7a12f0ab32365141e596cffcec (diff) | |
function rename to give clearer meaning that they change from window to 3d coordinates.
some functions had vague names, I even ended up re-writing some of these functions by accident!
also added doxy comments.
* ED_view3d_win_to_3d (was window_to_3d)
* ED_view3d_win_to_delta (was window_to_3d_delta)
* ED_view3d_win_to_vector (was window_to_3d_vector / viewvector)
* ED_view3d_win_to_segment_clip (was viewline)
* ED_view3d_win_to_ray (was viewray)
Diffstat (limited to 'source/blender/editors/transform')
| -rw-r--r-- | source/blender/editors/transform/transform.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/transform/transform_manipulator.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/transform/transform_snap.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c index 3643b183b31..85404aa98e1 100644 --- a/source/blender/editors/transform/transform.c +++ b/source/blender/editors/transform/transform.c @@ -125,7 +125,7 @@ void convertViewVec(TransInfo *t, float *vec, int dx, int dy) if (t->spacetype==SPACE_VIEW3D) { if (t->ar->regiontype == RGN_TYPE_WINDOW) { - window_to_3d_delta(t->ar, vec, dx, dy); + ED_view3d_win_to_delta(t->ar, dx, dy, vec); } } else if(t->spacetype==SPACE_IMAGE) { diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c index 1933b11b308..b6bb7e54855 100644 --- a/source/blender/editors/transform/transform_manipulator.c +++ b/source/blender/editors/transform/transform_manipulator.c @@ -557,7 +557,7 @@ static void test_manipulator_axis(const bContext *C) float angle; float vec[3]; - viewvector(rv3d, rv3d->twmat[3], vec); + ED_view3d_global_to_vector(rv3d, rv3d->twmat[3], vec); angle = fabs(angle_v3v3(rv3d->twmat[0], vec)); if (angle > (float)M_PI / 2.0f) { diff --git a/source/blender/editors/transform/transform_snap.c b/source/blender/editors/transform/transform_snap.c index 789a262f075..6510c9174c6 100644 --- a/source/blender/editors/transform/transform_snap.c +++ b/source/blender/editors/transform/transform_snap.c @@ -1581,7 +1581,7 @@ static int snapObjects(Scene *scene, View3D *v3d, ARegion *ar, Object *obedit, f int retval = 0; float ray_start[3], ray_normal[3]; - viewray(ar, v3d, mval, ray_start, ray_normal); + ED_view3d_win_to_ray(ar, v3d, mval, ray_start, ray_normal); if (mode == SNAP_ALL && obedit) { @@ -1812,7 +1812,7 @@ static int peelObjects(Scene *scene, View3D *v3d, ARegion *ar, Object *obedit, L int retval = 0; float ray_start[3], ray_normal[3]; - viewray(ar, v3d, mval, ray_start, ray_normal); + ED_view3d_win_to_ray(ar, v3d, mval, ray_start, ray_normal); for ( base = scene->base.first; base != NULL; base = base->next ) { if ( BASE_SELECTABLE(v3d, base) ) { |