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 +1 -1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2292211298 - Show all commits

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

@ -67,7 +67,6 @@ static void grease_pencil_copy_data(Main * /*bmain*/,
grease_pencil_src->drawing_array_size, __func__);
for (int i = 0; i < grease_pencil_src->drawing_array_size; i++) {
const GreasePencilDrawingBase *src_drawing_base = grease_pencil_src->drawing_array[i];
grease_pencil_dst->drawing_array[i]->user_count = src_drawing_base->user_count;
switch (src_drawing_base->type) {
case GP_DRAWING: {
const GreasePencilDrawing *src_drawing = reinterpret_cast<const GreasePencilDrawing *>(
@ -93,6 +92,7 @@ static void grease_pencil_copy_data(Main * /*bmain*/,
break;
}
}
grease_pencil_dst->drawing_array[i]->user_count = src_drawing_base->user_count;
}
/* Do not copy layer tree storage. */