Commit b551b18e authored by cutealien's avatar cutealien

Fix IAttributes::setAttribute implementation for textures (did do nothing before).

Bug was caused by CTextureAttribute not overloading the setTexture function correctly.
(compiler warning about that now also gone - just had needed some time to figure out if it's a real bug)


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4806 dfc29bdd-3216-0410-991c-e03cc46cb475
parent cf791b74
-------------------------- --------------------------
Changes in 1.9 (not yet released) Changes in 1.9 (not yet released)
- Fix IAttributes::setAttribute implementation for textures (did do nothing before).
- Added support for separate blending in OpenGL and D3D9 drivers. - Added support for separate blending in OpenGL and D3D9 drivers.
- Added pack_textureBlendFuncSeparate and unpack_textureBlendFuncSeparate functions, which allow to use separate blending functions in OpenGL. - Added pack_textureBlendFuncSeparate and unpack_textureBlendFuncSeparate functions, which allow to use separate blending functions in OpenGL.
- Added BlendFactor field to SMaterial which allow user to set blending factor per SMaterial set call without use EMT_ONETEXTURE_BLEND type. - Added BlendFactor field to SMaterial which allow user to set blending factor per SMaterial set call without use EMT_ONETEXTURE_BLEND type.
......
...@@ -1934,7 +1934,13 @@ public: ...@@ -1934,7 +1934,13 @@ public:
} }
} }
virtual void setTexture(video::ITexture* value) virtual void setTexture(video::ITexture* texture, const path& filename) _IRR_OVERRIDE_
{
OverrideName = filename;
setTexture(texture);
};
void setTexture(video::ITexture* value)
{ {
if ( value == Value ) if ( value == Value )
return; return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment