diff --git a/lib/irrlicht/changes.stk b/lib/irrlicht/changes.stk index c96db2635..29e055197 100644 --- a/lib/irrlicht/changes.stk +++ b/lib/irrlicht/changes.stk @@ -3,3 +3,4 @@ The following changes have been made: - primary sort by material type - stencil RTT support - drawall types +- materialtype override diff --git a/lib/irrlicht/include/EMaterialFlags.h b/lib/irrlicht/include/EMaterialFlags.h index 0adc702c4..57fb22c4b 100644 --- a/lib/irrlicht/include/EMaterialFlags.h +++ b/lib/irrlicht/include/EMaterialFlags.h @@ -84,7 +84,10 @@ namespace video EMF_BLEND_OPERATION = 0x40000, //! Flag for polygon offset - EMF_POLYGON_OFFSET = 0x80000 + EMF_POLYGON_OFFSET = 0x80000, + + //! MaterialType override + EMF_MATERIAL_TYPE = 0x100000 }; } // end namespace video diff --git a/lib/irrlicht/include/IVideoDriver.h b/lib/irrlicht/include/IVideoDriver.h index 01b7a365a..244155e8a 100644 --- a/lib/irrlicht/include/IVideoDriver.h +++ b/lib/irrlicht/include/IVideoDriver.h @@ -192,6 +192,7 @@ namespace video material.TextureLayer[0].TextureWrapU = Material.TextureLayer[0].TextureWrapU; material.TextureLayer[0].TextureWrapV = Material.TextureLayer[0].TextureWrapV; break; + case EMF_MATERIAL_TYPE: material.MaterialType = Material.MaterialType; break; case EMF_ANTI_ALIASING: material.AntiAliasing = Material.AntiAliasing; break; case EMF_COLOR_MASK: material.ColorMask = Material.ColorMask; break; case EMF_COLOR_MATERIAL: material.ColorMaterial = Material.ColorMaterial; break; diff --git a/lib/irrlicht/include/SMaterial.h b/lib/irrlicht/include/SMaterial.h index 3172241ec..1eb5dbb01 100644 --- a/lib/irrlicht/include/SMaterial.h +++ b/lib/irrlicht/include/SMaterial.h @@ -617,6 +617,8 @@ namespace video return BlendOperation != EBO_NONE; case EMF_POLYGON_OFFSET: return PolygonOffsetFactor != 0; + default: + break; } return false;