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

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

@ -91,6 +91,10 @@ static void grease_pencil_copy_data(Main * /*bmain*/,
}
}
/* Do not copy layer tree storage. */
grease_pencil_dst->layer_tree_storage.nodes = nullptr;
grease_pencil_dst->layer_tree_storage.nodes_num = 0;
/* Duplicate runtime data. */
if (grease_pencil_src->runtime) {
grease_pencil_dst->runtime = MEM_new<bke::GreasePencilRuntime>(__func__,
@ -152,6 +156,8 @@ static void grease_pencil_blend_write(BlendWriter *writer, ID *id, const void *i
grease_pencil->write_drawing_array(writer);
/* Write layer tree. */
grease_pencil->write_layer_tree_storage(writer);
Hans Goudey commented 2023-04-25 04:54:27 +02:00
Outdated
Review
Copy Link

Here the comment says "Write drawings" and the code says "write drawing array". That's basically the same thing-- the comment isn't really necessary. Same with the others here IMO.

Here the comment says "Write drawings" and the code says "write drawing array". That's basically the same thing-- the comment isn't really necessary. Same with the others here IMO.
Hans Goudey commented 2023-05-02 23:45:36 +02:00
Outdated
Review
Copy Link

Maybe this comment was missed? Or do you disagree?

Maybe this comment was missed? Or do you disagree?
/* Free the layer tree storage again after writing. */
grease_pencil->free_layer_tree_storage();
/* Write materials. */
BLO_write_pointer_array(
writer, grease_pencil->material_array_size, grease_pencil->material_array);
@ -175,6 +181,8 @@ static void grease_pencil_blend_read_data(BlendDataReader *reader, ID *id)
grease_pencil->runtime = MEM_new<blender::bke::GreasePencilRuntime>(__func__);
grease_pencil->load_layer_tree_from_storage();
/* Free the layer tree storage again after loading. */
grease_pencil->free_layer_tree_storage();
}
static void grease_pencil_blend_read_lib(BlendLibReader *reader, ID *id)