Merge branch 'master' of https://bitbucket.org/omigamedev/new_engine

2017-08-11 19:08:15 +01:00
parent 10fecd46b0 c2c046f77e
commit f08fd42a50
3 changed files with 4 additions and 2 deletions
--- a/engine/canvas.cpp
+++ b/engine/canvas.cpp
@@ -667,6 +667,7 @@ void ui::Canvas::layer_merge(int source_idx, int dest_idx)
            ui::ShaderManager::u_int(kShaderUniform::Tex, 0); // dest
            ui::ShaderManager::u_int(kShaderUniform::TexStroke, 1); // source
            ui::ShaderManager::u_float(kShaderUniform::Alpha, 1);
+            ShaderManager::u_int(kShaderUniform::Lock, false);
            ShaderManager::u_mat4(kShaderUniform::MVP, glm::ortho(-.5f, .5f, -.5f, .5f, -1.f, 1.f));

            glActiveTexture(GL_TEXTURE0);