Commit 8589d86b authored by cutealien's avatar cutealien

unpack_texureBlendFunc => unpack_textureBlendFunc in D3D8 (was renamed...

unpack_texureBlendFunc => unpack_textureBlendFunc in D3D8 (was renamed recently). Thanks at greenya for noticing!

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4066 dfc29bdd-3216-0410-991c-e03cc46cb475
parent f65a68a4
...@@ -938,7 +938,7 @@ void CD3D8Driver::draw2D3DVertexPrimitiveList(const void* vertices, ...@@ -938,7 +938,7 @@ void CD3D8Driver::draw2D3DVertexPrimitiveList(const void* vertices,
E_BLEND_FACTOR dstFact; E_BLEND_FACTOR dstFact;
E_MODULATE_FUNC modulo; E_MODULATE_FUNC modulo;
u32 alphaSource; u32 alphaSource;
unpack_texureBlendFunc ( srcFact, dstFact, modulo, alphaSource, Material.MaterialTypeParam); unpack_textureBlendFunc ( srcFact, dstFact, modulo, alphaSource, Material.MaterialTypeParam);
setRenderStates2DMode(alphaSource&video::EAS_VERTEX_COLOR, (Material.getTexture(0) != 0), (alphaSource&video::EAS_TEXTURE) != 0); setRenderStates2DMode(alphaSource&video::EAS_VERTEX_COLOR, (Material.getTexture(0) != 0), (alphaSource&video::EAS_TEXTURE) != 0);
} }
else else
......
...@@ -84,7 +84,7 @@ public: ...@@ -84,7 +84,7 @@ public:
E_BLEND_FACTOR srcFact,dstFact; E_BLEND_FACTOR srcFact,dstFact;
E_MODULATE_FUNC modulate; E_MODULATE_FUNC modulate;
u32 alphaSource; u32 alphaSource;
unpack_texureBlendFunc ( srcFact, dstFact, modulate, alphaSource, material.MaterialTypeParam ); unpack_textureBlendFunc ( srcFact, dstFact, modulate, alphaSource, material.MaterialTypeParam );
if (srcFact == EBF_SRC_COLOR && dstFact == EBF_ZERO) if (srcFact == EBF_SRC_COLOR && dstFact == EBF_ZERO)
pID3DDevice->SetRenderState(D3DRS_ALPHABLENDENABLE, FALSE); pID3DDevice->SetRenderState(D3DRS_ALPHABLENDENABLE, FALSE);
......
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