Commit 7f66a050 authored by Jan Möbius's avatar Jan Möbius

Merge branch 'hotFixGLErrorSettingBlendFunc' into 'master'

fixed glerror caused by materialnode passing bad values to blendfunc

See merge request !62
parents 4a00fecc 9912f593
......@@ -304,7 +304,7 @@ void MaterialNode::enter(GLState& _state, const DrawModes::DrawMode& _drawmode
if (material_.blending_)
{
_state.set_depthFunc(GL_LEQUAL);
ACG::GLState::blendFunc(material_.blendParam1_, material_.blendParam2_);
ACG::GLState::blendFunc(material_.blendingParam1(), material_.blendingParam2());
ACG::GLState::enable(GL_BLEND);
}
else
......
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