diff options
author | Oz Linden <oz@lindenlab.com> | 2011-05-17 18:47:51 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-05-17 18:47:51 -0400 |
commit | cb936d097fd40c743895cb35fce6b292c66e5210 (patch) | |
tree | c554c33c7576aa567ca2b32ad06ee9af83977059 /indra/newview/llpolymesh.h | |
parent | 32313dd3c6396324ea8f13285a69c01f38fe1cfc (diff) | |
parent | bd37b14e9217935b9d70faf04c835c9d4aeda9c7 (diff) |
pull back fix for STORM-1260 from beta branch
Diffstat (limited to 'indra/newview/llpolymesh.h')
-rw-r--r-- | indra/newview/llpolymesh.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llpolymesh.h b/indra/newview/llpolymesh.h index 894cd307c4..ba2bf85570 100644 --- a/indra/newview/llpolymesh.h +++ b/indra/newview/llpolymesh.h @@ -217,15 +217,15 @@ public: } // Get coords - const LLVector3 *getCoords() const{ + const LLVector4 *getCoords() const{ return mCoords; } // non const version - LLVector3 *getWritableCoords(); + LLVector4 *getWritableCoords(); // Get normals - const LLVector3 *getNormals() const{ + const LLVector4 *getNormals() const{ return mNormals; } @@ -247,7 +247,7 @@ public: } // intermediate morphed normals and output normals - LLVector3 *getWritableNormals(); + LLVector4 *getWritableNormals(); LLVector3 *getScaledNormals(); LLVector3 *getWritableBinormals(); @@ -341,11 +341,11 @@ protected: // Single array of floats for allocation / deletion F32 *mVertexData; // deformed vertices (resulting from application of morph targets) - LLVector3 *mCoords; + LLVector4 *mCoords; // deformed normals (resulting from application of morph targets) LLVector3 *mScaledNormals; // output normals (after normalization) - LLVector3 *mNormals; + LLVector4 *mNormals; // deformed binormals (resulting from application of morph targets) LLVector3 *mScaledBinormals; // output binormals (after normalization) |