From e43e3e11b93ea8cd6bce757c4a62d59eda20e8f5 Mon Sep 17 00:00:00 2001 From: Turo Lamminen Date: Mon, 8 Aug 2022 13:53:38 +0300 Subject: [PATCH] Move SharedModifierData definition to BlenderScene.h --- code/AssetLib/Blender/BlenderModifier.cpp | 4 ---- code/AssetLib/Blender/BlenderScene.h | 7 +++++++ 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/code/AssetLib/Blender/BlenderModifier.cpp b/code/AssetLib/Blender/BlenderModifier.cpp index d2b393dc4..09bad0cfa 100644 --- a/code/AssetLib/Blender/BlenderModifier.cpp +++ b/code/AssetLib/Blender/BlenderModifier.cpp @@ -71,10 +71,6 @@ static const fpCreateModifier creators[] = { nullptr // sentinel }; -// ------------------------------------------------------------------------------------------------ -struct SharedModifierData : ElemBase { - ModifierData modifier; -}; // ------------------------------------------------------------------------------------------------ void BlenderModifierShowcase::ApplyModifiers(aiNode &out, ConversionData &conv_data, const Scene &in, const Object &orig_object) { diff --git a/code/AssetLib/Blender/BlenderScene.h b/code/AssetLib/Blender/BlenderScene.h index c153d3c22..cef40b660 100644 --- a/code/AssetLib/Blender/BlenderScene.h +++ b/code/AssetLib/Blender/BlenderScene.h @@ -648,6 +648,13 @@ struct ModifierData : ElemBase { char name[32]; }; + +// ------------------------------------------------------------------------------------------------ +struct SharedModifierData : ElemBase { + ModifierData modifier; +}; + + // ------------------------------------------------------------------------------- struct SubsurfModifierData : ElemBase {