omar/panopainter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix merge layers undo

Browse Source
This commit is contained in:
omigamedev
2019-11-09 18:13:03 +01:00
parent 7ebc05327d
commit a7511d3256
2 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/canvas.cpp
View File

@@ -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::Tex, 0); // dest
ShaderManager::u_int(kShaderUniform::TexStroke, 1); // source ShaderManager::u_int(kShaderUniform::TexStroke, 1); // source
ShaderManager::u_vec2(kShaderUniform::Resolution, m_size); 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_float(kShaderUniform::Alpha, m_layers[source_idx]->m_opacity);
ShaderManager::u_int(kShaderUniform::Lock, false); ShaderManager::u_int(kShaderUniform::Lock, false);
ShaderManager::u_int(kShaderUniform::UseFragcoord, false); ShaderManager::u_int(kShaderUniform::UseFragcoord, false);

2
src/node_panel_layer.cpp
View File

@@ -410,7 +410,7 @@ void NodePanelLayer::merge(int src_index, int dst_index, bool create_history)
} }
a->m_snap = std::make_shared<LayerFrame::Snapshot>(); a->m_snap = std::make_shared<LayerFrame::Snapshot>();
*a->m_snap = Canvas::I->m_layers[dst_index]->snapshot(-1, *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 = Canvas::I->m_layers[src_index];
a->m_layer_node = std::static_pointer_cast<NodeLayer>(m_layers_container->m_children[src_index]); a->m_layer_node = std::static_pointer_cast<NodeLayer>(m_layers_container->m_children[src_index]);
a->m_layer_node->m_selected = false; a->m_layer_node->m_selected = false;