Skip to content

D
deprecated-irrlicht-mac
Commit e5368f57 authored by hybrid's avatar hybrid
Browse files
Options

Fix warnings 

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2790 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 68a7f4b1
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
source/Irrlicht/CD3D8Driver.cpp
View file @ e5368f57
...@@ -912,7 +912,7 @@ void CD3D8Driver::draw2D3DVertexPrimitiveList(const void* vertices, ...@@ -912,7 +912,7 @@ void CD3D8Driver::draw2D3DVertexPrimitiveList(const void* vertices,
E_MODULATE_FUNC modulo; E_MODULATE_FUNC modulo;
u32 alphaSource; u32 alphaSource;
unpack_texureBlendFunc ( srcFact, dstFact, modulo, alphaSource, Material.MaterialTypeParam); unpack_texureBlendFunc ( srcFact, dstFact, modulo, alphaSource, Material.MaterialTypeParam);
setRenderStates2DMode(alphaSource&video::EAS_VERTEX_COLOR, (Material.getTexture(0) != 0), alphaSource&video::EAS_TEXTURE); setRenderStates2DMode(alphaSource&video::EAS_VERTEX_COLOR, (Material.getTexture(0) != 0), (alphaSource&video::EAS_TEXTURE) != 0);
} }
else else
setRenderStates2DMode(Material.MaterialType==EMT_TRANSPARENT_VERTEX_ALPHA, (Material.getTexture(0) != 0), Material.MaterialType==EMT_TRANSPARENT_ALPHA_CHANNEL); setRenderStates2DMode(Material.MaterialType==EMT_TRANSPARENT_VERTEX_ALPHA, (Material.getTexture(0) != 0), Material.MaterialType==EMT_TRANSPARENT_ALPHA_CHANNEL);
......
source/Irrlicht/COpenGLDriver.cpp
View file @ e5368f57
...@@ -1442,7 +1442,7 @@ void COpenGLDriver::draw2DVertexPrimitiveList(const void* vertices, u32 vertexCo ...@@ -1442,7 +1442,7 @@ void COpenGLDriver::draw2DVertexPrimitiveList(const void* vertices, u32 vertexCo
E_MODULATE_FUNC modulo; E_MODULATE_FUNC modulo;
u32 alphaSource; u32 alphaSource;
unpack_texureBlendFunc ( srcFact, dstFact, modulo, alphaSource, Material.MaterialTypeParam); unpack_texureBlendFunc ( srcFact, dstFact, modulo, alphaSource, Material.MaterialTypeParam);
setRenderStates2DMode(alphaSource&video::EAS_VERTEX_COLOR, (Material.getTexture(0) != 0), alphaSource&video::EAS_TEXTURE); setRenderStates2DMode(alphaSource&video::EAS_VERTEX_COLOR, (Material.getTexture(0) != 0), (alphaSource&video::EAS_TEXTURE) != 0);
} }
else else
setRenderStates2DMode(Material.MaterialType==EMT_TRANSPARENT_VERTEX_ALPHA, (Material.getTexture(0) != 0), Material.MaterialType==EMT_TRANSPARENT_ALPHA_CHANNEL); setRenderStates2DMode(Material.MaterialType==EMT_TRANSPARENT_VERTEX_ALPHA, (Material.getTexture(0) != 0), Material.MaterialType==EMT_TRANSPARENT_ALPHA_CHANNEL);
......
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