diff --git a/engine/canvas.cpp b/engine/canvas.cpp index 742f558..6437d55 100644 --- a/engine/canvas.cpp +++ b/engine/canvas.cpp @@ -684,7 +684,7 @@ void ui::Canvas::layer_merge(int source_idx, int dest_idx) // m_layer index ui::ShaderManager::use(kShader::CompDraw); ui::ShaderManager::u_int(kShaderUniform::Tex, 0); // dest ui::ShaderManager::u_int(kShaderUniform::TexStroke, 1); // source - ui::ShaderManager::u_float(kShaderUniform::Alpha, 1); + ui::ShaderManager::u_float(kShaderUniform::Alpha, m_layers[source_idx].m_opacity); ui::ShaderManager::u_int(kShaderUniform::Lock, false); ui::ShaderManager::u_int(kShaderUniform::BlendMode, 0); // TODO: defaulted to normal, change to layer blend mode when implemented ui::ShaderManager::u_mat4(kShaderUniform::MVP, glm::ortho(-.5f, .5f, -.5f, .5f, -1.f, 1.f));