blender
/
blender
136
407
Fork 590
Code Issues 6.3k Pull Requests 779 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 +9 -5
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d38e05d48a - Show all commits

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

@ -320,7 +320,14 @@ void legacy_gpencil_to_grease_pencil(Main &main, GreasePencil &grease_pencil, bG
class GreasePencilRuntime {
public:
/**
* Allocated and freed by the drawing code. See `DRW_grease_pencil_batch_cache_*` functions.
*/
void *batch_cache = nullptr;
public:
GreasePencilRuntime() {}
~GreasePencilRuntime() {}
};
} // namespace blender::bke

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

@ -109,11 +109,8 @@ static void grease_pencil_copy_data(Main * /*bmain*/,
grease_pencil_src->active_layer->wrap().name());
}
/* Duplicate runtime data. */
if (grease_pencil_src->runtime) {
grease_pencil_dst->runtime = MEM_new<bke::GreasePencilRuntime>(__func__,
*grease_pencil_src->runtime);
}
/* Make sure the runtime pointer exists. */
grease_pencil_dst->runtime = MEM_new<bke::GreasePencilRuntime>(__func__);
}
static void grease_pencil_free_data(ID *id)