blender
/
blender
133
398
Fork 579
Code Issues 6.3k Pull Requests 747 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 +9 -9
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ac66f9b624 - Show all commits

18
source/blender/blenkernel/intern/grease_pencil_convert_legacy.cc
View File

@ -21,6 +21,12 @@ namespace blender::bke::greasepencil::convert {
void legacy_gpencil_frame_to_grease_pencil_drawing(GreasePencilDrawing &drawing, bGPDframe &gpf)
Hans Goudey commented 2023-05-02 23:41:46 +02:00
Outdated
Review
Copy Link

Order return argument last, make the gpf argument const

Order return argument last, make the `gpf` argument const
{
/* Construct an empty CurvesGeometry in-place. */
new (&drawing.geometry) CurvesGeometry();
drawing.base.type = GP_DRAWING;
drawing.runtime = MEM_new<bke::GreasePencilDrawingRuntime>(__func__);
/* TODO: set flag. */
/* Get the number of points, number of strokes and the offsets for each stroke. */
Vector<int> offsets;
offsets.append(0);
@ -32,8 +38,9 @@ void legacy_gpencil_frame_to_grease_pencil_drawing(GreasePencilDrawing &drawing,
num_strokes++;
}
/* Create a new CurvesGeometry. */
CurvesGeometry curves{num_points, num_strokes};
/* Resize the CurvesGeometry. */
CurvesGeometry &curves = drawing.geometry.wrap();
curves.resize(num_points, num_strokes);
curves.offsets_for_write().copy_from(offsets);
OffsetIndices<int> points_by_curve = curves.points_by_curve();
MutableAttributeAccessor attributes = curves.attributes_for_write();
@ -161,10 +168,6 @@ void legacy_gpencil_frame_to_grease_pencil_drawing(GreasePencilDrawing &drawing,
stroke_fill_scales.finish();
stroke_fill_colors.finish();
stroke_materials.finish();
curves.tag_topology_changed();
drawing.geometry.wrap() = std::move(curves);
}
void legacy_gpencil_to_grease_pencil(Main &bmain, GreasePencil &grease_pencil, bGPdata &gpd)
@ -225,9 +228,6 @@ void legacy_gpencil_to_grease_pencil(Main &bmain, GreasePencil &grease_pencil, b
MEM_new<GreasePencilDrawing>(__func__));
GreasePencilDrawing &drawing = *reinterpret_cast<GreasePencilDrawing *>(
grease_pencil.drawing_array[i]);
drawing.base.type = GP_DRAWING;
drawing.runtime = MEM_new<bke::GreasePencilDrawingRuntime>(__func__);
/* TODO: set flag. */
/* Convert the frame to a drawing. */
legacy_gpencil_frame_to_grease_pencil_drawing(drawing, *gpf);