From d05416a7cd71f6a29589adcd2bce57023982f91f Mon Sep 17 00:00:00 2001 From: David Rose Date: Thu, 6 Dec 2001 23:21:38 +0000 Subject: [PATCH] vc++ doesn't like 'vector' --- panda/src/gobj/lens.cxx | 4 ++-- panda/src/gobj/lens.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/panda/src/gobj/lens.cxx b/panda/src/gobj/lens.cxx index c5a6182b1c..bdaecc8bc4 100644 --- a/panda/src/gobj/lens.cxx +++ b/panda/src/gobj/lens.cxx @@ -1660,8 +1660,8 @@ build_shear_mat(LMatrix4f &shear_mat, //////////////////////////////////////////////////////////////////// float Lens:: sqr_dist_to_line(const LPoint3f &point, const LPoint3f &origin, - const LVector3f &vector) { - LVector3f norm = vector; + const LVector3f &vec) { + LVector3f norm = vec; norm.normalize(); LVector3f d = point - origin; float hyp_2 = d.length_squared(); diff --git a/panda/src/gobj/lens.h b/panda/src/gobj/lens.h index d55d298703..6e747ab761 100644 --- a/panda/src/gobj/lens.h +++ b/panda/src/gobj/lens.h @@ -173,7 +173,7 @@ private: const LPoint3f &cul, const LPoint3f &cur, const LPoint3f &cll, const LPoint3f &clr); static float sqr_dist_to_line(const LPoint3f &point, const LPoint3f &origin, - const LVector3f &vector); + const LVector3f &vec); protected: string _change_event;