blender
/
blender
136
411
Fork 595
Code Issues 6.3k Pull Requests 774 Projects 19 Wiki Activity

Fix #120287: GPv3: Crash when converting file with annotations #120294

Closed
Falk David wants to merge 3 commits from filedescriptor/blender:fix-120287 into main
pull from: filedescriptor/blender:fix-120287
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 5 Commits 3 Files Changed 1 +7 -3
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/blenkernel/intern/grease_pencil_convert_legacy.cc
View File

@ -2437,8 +2437,7 @@ void legacy_gpencil_object(Main &bmain, Object &object)
void legacy_main(Main &bmain, BlendFileReadReport & /*reports*/)
{
/* Allows to convert a legacy GPencil data only once, in case it's used by several objects. */
blender::Map<bGPdata *, GreasePencil *> legacy_to_greasepencil_data;
Map<bGPdata *, GreasePencil *> legacy_to_greasepencil_data;
LISTBASE_FOREACH (Object *, object, &bmain.objects) {
if (object->type != OB_GPENCIL_LEGACY) {
continue;
@ -2448,11 +2447,16 @@ void legacy_main(Main &bmain, BlendFileReadReport & /*reports*/)
/* Potential other usages of legacy bGPdata IDs also need to be remapped to their matching new
* GreasePencil counterparts. */
blender::bke::id::IDRemapper gpd_remapper;
bke::id::IDRemapper gpd_remapper;
/* Allow remapping from legacy bGPdata IDs to new GreasePencil ones. */
gpd_remapper.allow_idtype_mismatch = true;
LISTBASE_FOREACH (bGPdata *, legacy_gpd, &bmain.gpencils) {
/* Some `bGPdata` is still used as annotations. These should stay `bGPdata` and therefore be
* skipped for remapping. */
if ((legacy_gpd->flag & GP_DATA_ANNOTATIONS) != 0) {
continue;
}
GreasePencil *new_grease_pencil = legacy_to_greasepencil_data.lookup_default(legacy_gpd,
nullptr);
if (!new_grease_pencil) {