diff options
| author | Erwin Coumans <blender@erwincoumans.com> | 2007-01-07 07:39:39 +0300 |
|---|---|---|
| committer | Erwin Coumans <blender@erwincoumans.com> | 2007-01-07 07:39:39 +0300 |
| commit | 4a70681ce21d254f3bf7033380ec33732be2825d (patch) | |
| tree | b8941422557cc09eca7bde70ffed04d90e9e2b77 /source/gameengine/Rasterizer/RAS_TexVert.cpp | |
| parent | cf4d6278972046914764367f9b1b747dac012b00 (diff) | |
patch by Charlie, related to recent changes of multi-uv/lightmap generation. This fix makes it possible to use lightmaps in the game engine.
Diffstat (limited to 'source/gameengine/Rasterizer/RAS_TexVert.cpp')
| -rw-r--r-- | source/gameengine/Rasterizer/RAS_TexVert.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/gameengine/Rasterizer/RAS_TexVert.cpp b/source/gameengine/Rasterizer/RAS_TexVert.cpp index f6174f6de62..79e6cbdb7db 100644 --- a/source/gameengine/Rasterizer/RAS_TexVert.cpp +++ b/source/gameengine/Rasterizer/RAS_TexVert.cpp @@ -39,6 +39,7 @@ RAS_TexVert::RAS_TexVert(const MT_Point3& xyz, const MT_Point2& uv, + const MT_Point2& uv2, const MT_Vector4& tangent, const unsigned int rgba, const MT_Vector3& normal, @@ -46,7 +47,7 @@ RAS_TexVert::RAS_TexVert(const MT_Point3& xyz, { xyz.getValue(m_localxyz); uv.getValue(m_uv1); - uv.getValue(m_uv2); // ..py access + uv2.getValue(m_uv2); SetRGBA(rgba); SetNormal(normal); tangent.getValue(m_tangent); @@ -154,8 +155,8 @@ bool RAS_TexVert::closeTo(const RAS_TexVert* other) m_rgba == other->m_rgba && MT_fuzzyEqual(MT_Vector3(m_normal), MT_Vector3(other->m_normal)) && MT_fuzzyEqual(MT_Vector2(m_uv1), MT_Vector2(other->m_uv1)) && + MT_fuzzyEqual(MT_Vector2(m_uv2), MT_Vector2(other->m_uv2)) && // p -- MT_fuzzyEqual(MT_Vector3(m_localxyz), MT_Vector3(other->m_localxyz))) ; - } short RAS_TexVert::getFlag() const |