blender
/
blender
135
420
Fork 603
Code Issues 6.3k Pull Requests 754 Projects 19 Wiki Activity

Initial Grease Pencil 3.0 stage #106848

Merged
Falk David merged 224 commits from filedescriptor/blender:grease-pencil-v3 into main 2023-05-30 11:14:22 +02:00
Conversation 8 Commits 224 Files Changed 94 +17 -16
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 55f09417fb - Show all commits

26
source/blender/blenkernel/BKE_grease_pencil.hh
View File

@ -39,7 +39,15 @@ class TreeNode : public ::GreasePencilLayerTreeNode {
this->type = type;
this->name = BLI_strdup(name.c_str());
}
TreeNode(const TreeNode &other) = delete;
TreeNode(const TreeNode &other)
{
this->type = other.type;
this->name = BLI_strdup(other.name);
children_.reserve(other.children_.size());
for (const std::unique_ptr<TreeNode> &elem : other.children_) {
children_.append(std::make_unique<TreeNode>(*elem));
}
}
TreeNode(TreeNode &&other) : children_(std::move(other.children_))
{
this->name = other.name;
@ -197,25 +205,13 @@ class Layer : public TreeNode, ::GreasePencilLayer {
Layer(StringRefNull name) : TreeNode(GREASE_PENCIL_LAYER_TREE_LEAF, name), frames_()
{
}
Layer(const Layer &other)
: TreeNode(GREASE_PENCIL_LAYER_TREE_LEAF, other.name), frames_(other.frames_)
Layer(const Layer &other) : TreeNode(other)
{
}
Layer(Layer &&other) : TreeNode(std::move(other))
{
frames_ = std::move(other.frames_);
}
Layer &operator=(const Layer &other)
{
return copy_assign_container(*this, other);
}
Layer &operator=(Layer &&other)
{
if (this != &other) {
frames_ = std::move(other.frames_);
}
return *this;
}
~Layer()
{
}
@ -238,7 +234,7 @@ class LayerGroup : public TreeNode {
LayerGroup(StringRefNull name) : TreeNode(GREASE_PENCIL_LAYER_TREE_GROUP, name)
{
}
LayerGroup(const LayerGroup &other) : TreeNode(GREASE_PENCIL_LAYER_TREE_GROUP, other.name)
LayerGroup(const LayerGroup &other) : TreeNode(other)
{
}
LayerGroup(LayerGroup &&other) : TreeNode(std::move(other))

7
source/blender/blenkernel/intern/grease_pencil_test.cc
View File

@ -17,8 +17,13 @@ TEST(gpencil, build_layer_tree)
group.add_layer(Layer("Layer1"));
group.add_layer(Layer("Layer2"));
LayerGroup group2("Group2");
group2.add_layer(Layer("Layer3"));
group2.add_layer(Layer("Layer4"));
group.add_group(std::move(group2));
root.add_group(std::move(group));
root.add_layer(Layer("Layer3"));
root.add_layer(Layer("Layer5"));
root.foreach_children_pre_order([](TreeNode &child) { std::cout << child.name << std::endl; });
}