update xcode

This commit is contained in:
2019-06-19 10:58:34 +02:00
parent 41ece63aa7
commit 6058f05d3f
5 changed files with 38 additions and 22 deletions

View File

@@ -88,7 +88,7 @@ public:
virtual void run() override { }
virtual Action* get_redo() override;
virtual void undo() override;
virtual size_t memory() override;
virtual size_t memory() override { return 0; }
};
class ActionLayerRemove : public Action
@@ -96,12 +96,12 @@ class ActionLayerRemove : public Action
public:
NodePanelLayer* m_panel;
std::shared_ptr<Node> m_layer_node;
std::shared_ptr<class Layer> m_layer;
std::shared_ptr<Layer> m_layer;
int m_layer_order;
virtual void run() override { }
virtual Action* get_redo() override;
virtual void undo() override;
virtual size_t memory() override;
virtual size_t memory() override { return 0; }
};
class ActionLayerMove : public Action
@@ -113,7 +113,7 @@ public:
virtual void run() override { }
virtual Action* get_redo() override;
virtual void undo() override;
virtual size_t memory() override;
virtual size_t memory() override { return 0; }
};
struct ActionLayerMerge : public Action
@@ -128,7 +128,7 @@ struct ActionLayerMerge : public Action
std::array<glm::vec4, 6> m_dirty_box;
std::array<bool, 6> m_dirty_face;
virtual void run() override { }
virtual size_t memory() override { return 0; }
virtual size_t memory() override { return m_snap->memsize(); }
virtual void undo() override;
virtual Action* get_redo() override;
};