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

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

@ -22,6 +22,8 @@ namespace gpencil::convert {
CurvesGeometry legacy_gpencil_frame_to_curves_geometry(bGPDframe &gpf);
void legacy_gpencil_to_grease_pencil(bGPdata &gpd, GreasePencil &grease_pencil);
} // namespace gpencil::convert
} // namespace blender::bke

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

@ -91,4 +91,35 @@ CurvesGeometry legacy_gpencil_frame_to_curves_geometry(bGPDframe &gpf)
return curves;
}
void legacy_gpencil_to_grease_pencil(bGPdata &gpd, GreasePencil &grease_pencil)
{
int num_layers = 0;
int num_drawings = 0;
LISTBASE_FOREACH (bGPDlayer *, gpl, &gpd.layers) {
num_drawings += BLI_listbase_count(&gpl->frames);
num_layers++;
}
grease_pencil.drawing_array_size = num_drawings;
grease_pencil.drawing_array = reinterpret_cast<GreasePencilDrawingOrReference **>(
MEM_cnew_array<GreasePencilDrawing>(num_drawings, __func__));
int i = 0;
LISTBASE_FOREACH (bGPDlayer *, gpl, &gpd.layers) {
/* TODO: create a new layer here. */
LISTBASE_FOREACH (bGPDframe *, gpf, &gpl->frames) {
GreasePencilDrawing &drawing = *reinterpret_cast<GreasePencilDrawing *>(
grease_pencil.drawing_array[i]);
drawing.base.type = GREASE_PENCIL_DRAWING;
/* TODO: copy flag. */
/* Convert the frame to a drawing. */
drawing.geometry = legacy_gpencil_frame_to_curves_geometry(*gpf);
/* TODO: add drawing to layer. Using the gpf->framenum. */
i++;
}
}
}
} // namespace blender::bke::gpencil::convert

3
source/blender/makesdna/DNA_grease_pencil_types.h
View File

@ -181,9 +181,6 @@ typedef struct GreasePencil {
*/
GreasePencilDrawingOrReference **drawing_array;
int drawing_array_size;
#ifdef __cplusplus
blender::Span<GreasePencilDrawingOrReference *> drawings() const;
#endif
char _pad[4];
#ifdef __cplusplus