From 4b6a61354d3786d5b62274ca58dafd6840bc4dcd Mon Sep 17 00:00:00 2001 From: Malin Ejdbo Date: Wed, 17 Feb 2021 10:03:54 +0100 Subject: [PATCH] Add deprecation warning when using several model files for one model --- modules/base/rendering/renderablemodel.cpp | 6 ++++++ .../rendering/renderablemodelprojection.cpp | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/modules/base/rendering/renderablemodel.cpp b/modules/base/rendering/renderablemodel.cpp index 0560cff36a..4cd2fc7f63 100644 --- a/modules/base/rendering/renderablemodel.cpp +++ b/modules/base/rendering/renderablemodel.cpp @@ -42,6 +42,8 @@ #include namespace { + constexpr const char* _loggerCat = "RenderableModel"; + constexpr const char* ProgramName = "ModelProgram"; constexpr const char* KeyGeomModelFile = "GeometryFile"; constexpr const char* KeyForceRenderInvisible = "ForceRenderInvisible"; @@ -290,6 +292,10 @@ RenderableModel::RenderableModel(const ghoul::Dictionary& dictionary) ); } else if (dictionary.hasValue(KeyGeomModelFile)) { + LWARNING("Loading a model with several files is deprecated and will be " + "removed in a future release" + ); + ghoul::Dictionary fileDictionary = dictionary.value( KeyGeomModelFile ); diff --git a/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp b/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp index 5c0e3bdc15..a15b964bc3 100644 --- a/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp +++ b/modules/spacecraftinstruments/rendering/renderablemodelprojection.cpp @@ -143,6 +143,10 @@ RenderableModelProjection::RenderableModelProjection(const ghoul::Dictionary& di ); } else if (dictionary.hasValue(KeyGeomModelFile)) { + LWARNING("Loading a model with several files is deprecated and will be " + "removed in a future release" + ); + ghoul::Dictionary fileDictionary = dictionary.value( KeyGeomModelFile );