blender
/
blender
135
420
Fork 602
Code Issues 6.3k Pull Requests 755 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 +2 -1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 279f706462 - Show all commits

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

@ -88,6 +88,7 @@ static void grease_pencil_copy_data(Main * /*bmain*/,
} }
} }
/* Duplicate runtime data. */
if (grease_pencil_src->runtime) { if (grease_pencil_src->runtime) {
grease_pencil_dst->runtime = MEM_new<bke::GreasePencilRuntime>(__func__, grease_pencil_dst->runtime = MEM_new<bke::GreasePencilRuntime>(__func__,
*grease_pencil_src->runtime); *grease_pencil_src->runtime);
@ -539,7 +540,7 @@ void GreasePencil::write_layer_tree_storage(BlendWriter *writer)
void GreasePencil::free_layer_tree_storage() void GreasePencil::free_layer_tree_storage()
{ {
if (this->layer_tree_storage.nodes_num == 0 || !this->layer_tree_storage.nodes) { if (this->layer_tree_storage.nodes_num == 0 || this->layer_tree_storage.nodes == nullptr) {
return; return;
} }
for (int i = 0; i < this->layer_tree_storage.nodes_num; i++) { for (int i = 0; i < this->layer_tree_storage.nodes_num; i++) {