Commit 1e607f41 authored by hybrid's avatar hybrid

Merged from 1.5 branch, revisions 2319:2324. Fixed transparency issue with...

Merged from 1.5 branch, revisions 2319:2324. Fixed transparency issue with onetextureblend material and debug symbol under linux.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2325 dfc29bdd-3216-0410-991c-e03cc46cb475
parent a4087d5c
......@@ -116,6 +116,12 @@ public:
}
//! Returns if the material is transparent.
virtual bool isTransparent() const
{
return true;
}
private:
u32 getD3DBlend ( E_BLEND_FACTOR factor ) const
......
......@@ -134,6 +134,16 @@ public:
}
//! Returns if the material is transparent.
/** The scene management needs to know this for being able to sort the
materials by opaque and transparent.
The return value could be optimized, but we'd need to know the
MaterialTypeParam for it. */
virtual bool isTransparent() const
{
return true;
}
private:
u32 getD3DBlend ( E_BLEND_FACTOR factor ) const
......
......@@ -155,6 +155,13 @@ public:
glDisable(GL_ALPHA_TEST);
}
//! Returns if the material is transparent.
/** Is not always transparent, but mostly. */
virtual bool isTransparent() const
{
return true;
}
private:
u32 getGLBlend ( E_BLEND_FACTOR factor ) const
......
......@@ -264,12 +264,14 @@
<Add option="-W" />
<Add option="-Wall" />
<Add option="-g" />
<Add option="-D_DEBUG" />
<Add option="-O0" />
<Add option="-Wextra" />
<Add option="-Wno-unused-parameter" />
<Add directory="..\..\include" />
<Add directory="zlib" />
<Add directory="libpng" />
<Add directory="jpeglib" />
</Compiler>
<Linker>
<Add library="GL" />
......@@ -294,6 +296,7 @@
<Add directory="..\..\include" />
<Add directory="zlib" />
<Add directory="libpng" />
<Add directory="jpeglib" />
</Compiler>
<Linker>
<Add library="GL" />
......@@ -319,6 +322,7 @@
<Add directory="..\..\include" />
<Add directory="zlib" />
<Add directory="libpng" />
<Add directory="jpeglib" />
</Compiler>
<Linker>
<Add library="GL" />
......
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