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

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

@ -62,13 +62,11 @@ static void grease_pencil_copy_data(Main * /*bmain*/,
case GREASE_PENCIL_DRAWING: {
const GreasePencilDrawing *src_drawing = reinterpret_cast<const GreasePencilDrawing *>(
src_drawing_or_ref);
const bke::CurvesGeometry &src_geom = src_drawing->geometry.wrap();
grease_pencil_dst->drawing_array[i] = reinterpret_cast<GreasePencilDrawingOrReference *>(
MEM_cnew<GreasePencilDrawing>(__func__));
GreasePencilDrawing *dst_drawing = reinterpret_cast<GreasePencilDrawing *>(
grease_pencil_dst->drawing_array[i]);
bke::CurvesGeometry &dst_geom = dst_drawing->geometry.wrap();
dst_drawing->base.type = src_drawing->base.type;
dst_drawing->base.flag = src_drawing->base.flag;
@ -302,18 +300,27 @@ void GreasePencil::foreach_visible_drawing(
int frame,
blender::FunctionRef<void(GreasePencilDrawing &, blender::bke::gpencil::Layer &)> function)
{
using namespace blender::bke::gpencil;
filedescriptor marked this conversation as resolved Outdated
Falk David commented 2023-04-12 10:48:52 +02:00
Outdated
Review
Copy Link

Make sure to not overwrite min and max but account any value already present. E.g. use math::min_max(...).

Make sure to not overwrite `min` and `max` but account any value already present. E.g. use `math::min_max(...)`.
blender::Span<GreasePencilDrawingOrReference *> drawings = this->drawings();
this->runtime->root_group().foreach_layer_pre_order([&](blender::bke::gpencil::Layer &layer) {
if (layer.frames().contains(frame)) {
int index = layer.frames().lookup(frame);
GreasePencilDrawingOrReference *drawing_or_reference = drawings[index];
if (drawing_or_reference->type == GREASE_PENCIL_DRAWING) {
GreasePencilDrawing *drawing = reinterpret_cast<GreasePencilDrawing *>(
drawing_or_reference);
function(*drawing, layer);
}
for (TreeNode &node : this->runtime->root_group().children_in_pre_order()) {
if (!node.is_layer()) {
continue;
}
});
Layer &layer = node.as_layer();
if (!layer.frames().contains(frame)) {
continue;
}
int index = layer.frames().lookup(frame);
GreasePencilDrawingOrReference *drawing_or_reference = drawings[index];
if (drawing_or_reference->type == GREASE_PENCIL_DRAWING) {
GreasePencilDrawing *drawing = reinterpret_cast<GreasePencilDrawing *>(drawing_or_reference);
function(*drawing, layer);
}
else if (drawing_or_reference->type == GREASE_PENCIL_DRAWING_REFERENCE) {
/* TODO */
}
}
}
void GreasePencil::read_drawing_array(BlendDataReader *reader)