blender
/
blender
136
406
Fork 589
Code Issues 6.3k Pull Requests 766 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 +16 -1
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e7652c5e0d - Show all commits

2
source/blender/blenkernel/intern/grease_pencil.cc
View File

@ -418,7 +418,7 @@ bool Layer::overwrite_frame(int frame_number, GreasePencilFrame &frame)
bool Layer::overwrite_frame(int frame_number, GreasePencilFrame &&frame)
{
return this->frames_for_write().add_overwrite(frame_number, frame);
return this->frames_for_write().add_overwrite(frame_number, std::move(frame));
}
Span<int> Layer::sorted_keys() const

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

@ -16,6 +16,8 @@ namespace blender::bke::greasepencil::tests {
/* --------------------------------------------------------------------------------------------- */
/* Grease Pencil ID Tests. */
/* Note: Using a struct with constructor and destructor instead of a fixture here, to have all the
* tests in the same group. */
struct GreasePencilIDTestContext {
Main *bmain = nullptr;
@ -159,6 +161,19 @@ TEST(greasepencil, remove_drawing)
expected_frames_pairs_layer0[1][1]);
}
TEST(greasepencil, overwrite_frame)
{
Layer layer1("Layer1");
layer1.insert_frame(0, GreasePencilFrame{0});
layer1.tag_frames_map_keys_changed();
EXPECT_EQ(layer1.frames().lookup(0).drawing_index, 0);
layer1.overwrite_frame(0, GreasePencilFrame{42});
EXPECT_EQ(layer1.frames().lookup(0).drawing_index, 42);
}
/* --------------------------------------------------------------------------------------------- */
/* Layer Tree Tests. */