blender
/
blender
137
418
Fork 600
Code Issues 6.3k Pull Requests 783 Projects 19 Wiki Activity

GPv3: Fix: Crash when drawing without a layer #109330

Closed
casey-bianco-davis wants to merge 11 commits from casey-bianco-davis:GPv3-draw-crash-no-layer into main
pull from: casey-bianco-davis:GPv3-draw-crash-no-layer
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 2 Commits 11 Files Changed 1 +4 -2
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6b9b99c978 - Show all commits

6
source/blender/editors/sculpt_paint/grease_pencil_paint.cc
View File

@ -59,7 +59,8 @@ struct PaintOperationExecutor {
grease_pencil.add_empty_drawings(1);
GreasePencilFrame frame{int(grease_pencil.drawings().index_range().last()), 0, BEZT_KEYTYPE_KEYFRAME};
GreasePencilFrame frame{
casey-bianco-davis marked this conversation as resolved Outdated
Falk David commented 2023-06-26 12:05:49 +02:00
Outdated
Review
Copy Link

This is not right. The frame should point to the newly added empty drawing.
GreasePencilFrame frame{this->drawings().index_range().last(), 0, BEZT_KEYTYPE_KEYFRAME};

This is not right. The `frame` should point to the newly added empty drawing. `GreasePencilFrame frame{this->drawings().index_range().last(), 0, BEZT_KEYTYPE_KEYFRAME};`
int(grease_pencil.drawings().index_range().last()), 0, BEZT_KEYTYPE_KEYFRAME};
new_layer.insert_frame(scene->r.cfra, frame);
}
@ -98,7 +99,8 @@ void PaintOperation::on_stroke_done(const bContext &C)
grease_pencil_orig.add_empty_drawings(1);
GreasePencilFrame frame{int(grease_pencil_orig.drawings().index_range().last()), 0, BEZT_KEYTYPE_KEYFRAME};
GreasePencilFrame frame{
int(grease_pencil_orig.drawings().index_range().last()), 0, BEZT_KEYTYPE_KEYFRAME};
new_layer.insert_frame(scene->r.cfra, frame);
}
BLI_assert(grease_pencil_orig.has_active_layer() && grease_pencil_eval.has_active_layer());