Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14005 from wighawag/draw_node_shader_fix 

allow to use custom shader uniforms and attributes on drawNode
This commit is contained in:
minggo 2016-04-22 10:49:41 +08:00
parent 2c75a4cf39 6ebdd3baf9
commit 16c7a594c8
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocos/2d/CCDrawNode.cpp
View File

@ -326,9 +326,7 @@ void DrawNode::draw(Renderer *renderer, const Mat4 &transform, uint32_t flags)
void DrawNode::onDraw(const Mat4 &transform, uint32_t flags)
{
auto glProgram = getGLProgram();
glProgram->use();
glProgram->setUniformsForBuiltins(transform);
getGLProgramState()->apply(transform);
GL::blendFunc(_blendFunc.src, _blendFunc.dst);