fix merge layers undo

2019-11-09 18:13:03 +01:00
parent 7ebc05327d
commit a7511d3256
2 changed files with 1 additions and 2 deletions
--- a/src/canvas.cpp
+++ b/src/canvas.cpp
@@ -1334,7 +1334,6 @@ void Canvas::layer_merge(int source_idx, int dest_idx) // m_layer index
                ShaderManager::u_int(kShaderUniform::Tex, 0); // dest
                ShaderManager::u_int(kShaderUniform::TexStroke, 1); // source
                ShaderManager::u_vec2(kShaderUniform::Resolution, m_size);
-                ShaderManager::u_float(kShaderUniform::PatternAlpha, 0);
                ShaderManager::u_float(kShaderUniform::Alpha, m_layers[source_idx]->m_opacity);
                ShaderManager::u_int(kShaderUniform::Lock, false);
                ShaderManager::u_int(kShaderUniform::UseFragcoord, false);