Skip to content
Snippets Groups Projects
Commit 4842c368 authored by Bastien Montagne's avatar Bastien Montagne Committed by Philipp Oeser
Browse files

Fix #127142: Do not instantiate loose 'annotation' legacy GPv2 data on link.

parent 21142a80
Branches
Tags
No related merge requests found
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include "DNA_ID.h" #include "DNA_ID.h"
#include "DNA_collection_types.h" #include "DNA_collection_types.h"
#include "DNA_gpencil_legacy_types.h"
#include "DNA_key_types.h" #include "DNA_key_types.h"
#include "DNA_object_types.h" #include "DNA_object_types.h"
#include "DNA_scene_types.h" #include "DNA_scene_types.h"
...@@ -589,6 +590,12 @@ static void loose_data_instantiate_obdata_preprocess( ...@@ -589,6 +590,12 @@ static void loose_data_instantiate_obdata_preprocess(
if (!OB_DATA_SUPPORT_ID(idcode)) { if (!OB_DATA_SUPPORT_ID(idcode)) {
continue; continue;
} }
if (idcode == ID_GD_LEGACY) {
bGPdata *legacy_gpd = (bGPdata *)id;
if ((legacy_gpd->flag & GP_DATA_ANNOTATIONS) != 0) {
continue;
}
}
id->tag |= LIB_TAG_DOIT; id->tag |= LIB_TAG_DOIT;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment