From a7511d325678a82017cdd43e247728f1cde1bbfe Mon Sep 17 00:00:00 2001 From: omigamedev Date: Sat, 9 Nov 2019 18:13:03 +0100 Subject: [PATCH] fix merge layers undo --- src/canvas.cpp | 1 - src/node_panel_layer.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/canvas.cpp b/src/canvas.cpp index ba9315d..d4a0288 100644 --- 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); diff --git a/src/node_panel_layer.cpp b/src/node_panel_layer.cpp index 12a6989..120b8e3 100644 --- a/src/node_panel_layer.cpp +++ b/src/node_panel_layer.cpp @@ -410,7 +410,7 @@ void NodePanelLayer::merge(int src_index, int dst_index, bool create_history) } a->m_snap = std::make_shared(); *a->m_snap = Canvas::I->m_layers[dst_index]->snapshot(-1, - &Canvas::I->m_layers[src_index]->frame().m_dirty_box, &Canvas::I->m_layers[src_index]->frame().m_dirty_face); + &Canvas::I->m_layers[dst_index]->frame().m_dirty_box, &Canvas::I->m_layers[dst_index]->frame().m_dirty_face); a->m_layer = Canvas::I->m_layers[src_index]; a->m_layer_node = std::static_pointer_cast(m_layers_container->m_children[src_index]); a->m_layer_node->m_selected = false;