fix layer and frame duplicate

2019-11-04 15:03:21 +01:00
parent adc64ad42e
commit 4b6316bf68
5 changed files with 38 additions and 13 deletions
--- a/src/canvas_layer.cpp
+++ b/src/canvas_layer.cpp
@@ -27,8 +27,10 @@ bool& Layer::face(int i, int frame /*= -1*/)
    return m_frames[frame].m_dirty_face[i];
 }

-LayerFrame& Layer::frame()
+LayerFrame& Layer::frame(int frame /*= -1*/)
 {
+    if (frame == -1)
+        frame = m_frame_index;
    return m_frames[m_frame_index];
 }

@@ -205,6 +207,8 @@ void Layer::remove_frame(int frame)

 void Layer::duplicate_frame(int frame)
 {
+    if (frame == -1)
+        frame = m_frame_index;
    m_frames.insert(m_frames.begin() + frame + 1, m_frames[frame].clone());
    frames_gpu_update();
 }