blender
/
blender
134
422
Fork 605
Code Issues 6.4k Pull Requests 766 Projects 19 Wiki Activity

GPv3: Insert grease pencil keyframe from the dopesheet #110649

Merged
Amélie Fondevilla merged 23 commits from amelief/blender:gpv3-insert-keyframe into main 2023-08-02 14:56:24 +02:00
Conversation 1 Commits 23 Files Changed 5 +15 -9
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9e1e4c8c45 - Show all commits

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

@ -1430,16 +1430,22 @@ bool GreasePencil::insert_duplicate_frame(blender::bke::greasepencil::Layer &lay
duplicate_frame->type = frame.type;
const GreasePencilDrawingBase *drawing_base = this->drawings(frame.drawing_index);
BLI_assert_msg((drawing_base->type == GP_DRAWING),
"Drawing references cannot be duplicated yet.");
const GreasePencilDrawing *drawing = reinterpret_cast<const GreasePencilDrawing *>(drawing_base);
if (do_instance) {
/* TODO : add user to the drawing. */
switch (drawing_base->type) {
case GP_DRAWING: {
const GreasePencilDrawing *drawing = reinterpret_cast<const GreasePencilDrawing *>(
drawing_base);
if (do_instance) {
/* TODO : add user to the drawing. */
}
amelief marked this conversation as resolved Outdated
Falk David commented 2023-08-01 17:40:06 +02:00
Outdated
Review
Copy Link

using namespace blender::bke::greasepencil; here so we can use Drawing below.

`using namespace blender::bke::greasepencil;` here so we can use `Drawing` below.
else {
this->add_duplicate_drawings(1, drawing->wrap());
amelief marked this conversation as resolved Outdated
Falk David commented 2023-08-01 17:33:12 +02:00
Outdated
Review
Copy Link

Rather than asserting here, I think we can return false. I don't think we should crash here if the frame_number isn't found.

Rather than asserting here, I think we can return `false`. I don't think we should crash here if the `frame_number` isn't found.
}
break;
}
case GP_DRAWING_REFERENCE:
/* TODO: Duplicate drawing references. */
return false;
}
else {
this->add_duplicate_drawings(1, drawing->wrap());
}
return true;
}