griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: GPv3: Remove unused public GP object conversion function.

Browse Source 
This was used during development for the conversion operator. now that
all data is systematically converted on load, it was not needed anymore
(and already unused).
This commit is contained in:
Bastien Montagne
2024-08-20 09:58:22 +02:00
parent 5a1f264d49
commit 382122f172
2 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_grease_pencil_legacy_convert.hh
View File

@@ -21,8 +21,6 @@ struct GreasePencilLineartModifierData;
namespace blender::bke::greasepencil::convert {
void legacy_gpencil_object(Main &bmain, Object &object);
/** Main entry point to convert all legacy GPData into GreasePencil data and objects. */
void legacy_main(Main &bmain, BlendFileReadReport &reports);

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

@@ -2897,7 +2897,7 @@ static void legacy_gpencil_sanitize_annotations(Main &bmain)
}
}
static void legacy_gpencil_object_ex(ConversionData &conversion_data, Object &object)
static void legacy_gpencil_object(ConversionData &conversion_data, Object &object)
{
BLI_assert((GS(static_cast<ID *>(object.data)->name) == ID_GD_LEGACY));
@@ -2937,13 +2937,6 @@ static void legacy_gpencil_object_ex(ConversionData &conversion_data, Object &ob
BKE_object_free_derived_caches(&object);
}
void legacy_gpencil_object(Main &bmain, Object &object)
{
ConversionData conversion_data(bmain);
legacy_gpencil_object_ex(conversion_data, object);
}
void legacy_main(Main &bmain, BlendFileReadReport & /*reports*/)
{
ConversionData conversion_data(bmain);
@@ -2955,7 +2948,7 @@ void legacy_main(Main &bmain, BlendFileReadReport & /*reports*/)
if (object->type != OB_GPENCIL_LEGACY) {
continue;
}
legacy_gpencil_object_ex(conversion_data, *object);
legacy_gpencil_object(conversion_data, *object);
}
/* Potential other usages of legacy bGPdata IDs also need to be remapped to their matching new