Report as OpenGL 3

[irrlicht.git] / include / SMaterial.h

diff --git a/include/SMaterial.h b/include/SMaterial.h
index 9874d77bf2b504d7e32c0c61aad1688b95617c87..88460e008f74a38c8da3e12e39768ccdf5a5a4b2 100644 (file)
--- a/include/SMaterial.h
+++ b/include/SMaterial.h
@@ -12,6 +12,7 @@
 #include "EMaterialTypes.h"\r
 #include "EMaterialFlags.h"\r
 #include "SMaterialLayer.h"\r
+#include "IrrCompileConfig.h" // for IRRLICHT_API\r
 \r
 namespace irr\r
 {\r
@@ -280,7 +281,7 @@ namespace video
        /** SMaterial might ignore some textures in most function, like assignment and comparison,\r
                when SIrrlichtCreationParameters::MaxTextureUnits is set to a lower number.\r
        */\r
-       const u32 MATERIAL_MAX_TEXTURES = _IRR_MATERIAL_MAX_TEXTURES_;\r
+       const u32 MATERIAL_MAX_TEXTURES = 4;\r
 \r
        //! Struct for holding parameters for a material renderer\r
        // Note for implementors: Serialization is in CNullDriver\r
@@ -301,16 +302,6 @@ namespace video
                        FogEnable(false), NormalizeNormals(false), UseMipMaps(true)\r
                { }\r
 \r
-               //! Copy constructor\r
-               /** \param other Material to copy from. */\r
-               SMaterial(const SMaterial& other)\r
-               {\r
-                       // These pointers are checked during assignment\r
-                       for (u32 i=0; i<MATERIAL_MAX_TEXTURES; ++i)\r
-                               TextureLayer[i].TextureMatrix = 0;\r
-                       *this = other;\r
-               }\r
-\r
                //! Texture layer array.\r
                SMaterialLayer TextureLayer[MATERIAL_MAX_TEXTURES];\r
 \r
@@ -355,7 +346,7 @@ namespace video
                f32 Shininess;\r
 \r
                //! Free parameter, dependent on the material type.\r
-               /** Mostly ignored, used for example in EMT_PARALLAX_MAP_SOLID,\r
+               /** Mostly ignored, used for example in\r
                EMT_TRANSPARENT_ALPHA_CHANNEL and EMT_ONETEXTURE_BLEND. */\r
                f32 MaterialTypeParam;\r
 \r