S3DVertex initialize color always. It's derived classes now both accept const S3DVert...

[irrlicht.git] / include / S3DVertex.h

diff --git a/include/S3DVertex.h b/include/S3DVertex.h
index 2040f9d1d985cc280401829fe2b94106dd8671ec..3d78e2037f934f92b8b95ec125be7183833c8545 100644 (file)
--- a/include/S3DVertex.h
+++ b/include/S3DVertex.h
@@ -44,7 +44,7 @@ const char* const sBuiltInVertexTypeNames[] =
 struct S3DVertex\r
 {\r
        //! default constructor\r
-       S3DVertex() {}\r
+       S3DVertex() : Color(0xffffffff) {}\r
 \r
        //! constructor\r
        S3DVertex(f32 x, f32 y, f32 z, f32 nx, f32 ny, f32 nz, SColor c, f32 tu, f32 tv)\r
@@ -142,7 +142,7 @@ struct S3DVertex2TCoords : public S3DVertex
                : S3DVertex(pos, normal, color, tcoords), TCoords2(tcoords) {}\r
 \r
        //! constructor from S3DVertex\r
-       S3DVertex2TCoords(S3DVertex& o) : S3DVertex(o) {}\r
+       S3DVertex2TCoords(const S3DVertex& o) : S3DVertex(o) {}\r
 \r
        //! Second set of texture coordinates\r
        core::vector2d<f32> TCoords2;\r
@@ -214,6 +214,9 @@ struct S3DVertexTangents : public S3DVertex
                const core::vector3df& binormal=core::vector3df())\r
                : S3DVertex(pos, normal, c, tcoords), Tangent(tangent), Binormal(binormal) { }\r
 \r
+       //! constructor from S3DVertex\r
+       S3DVertexTangents(const S3DVertex& o) : S3DVertex(o) {}\r
+\r
        //! Tangent vector along the x-axis of the texture\r
        core::vector3df Tangent;\r
 \r