From 9dd2b858e8a60c8f31a491b04d7d0388fb80a852 Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Wed, 12 Jul 2023 17:20:48 +0800 Subject: Cast COLLADA dom instance as instructed on its doc which can be found too in the system COLLADA DOM headers. --- indra/llprimitive/lldaeloader.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'indra/llprimitive') diff --git a/indra/llprimitive/lldaeloader.cpp b/indra/llprimitive/lldaeloader.cpp index 752a850d42..dead788fbe 100644 --- a/indra/llprimitive/lldaeloader.cpp +++ b/indra/llprimitive/lldaeloader.cpp @@ -943,12 +943,20 @@ bool LLDAELoader::OpenFile(const std::string& filename) domCOLLADA* dom; if (mPreprocessDAE) { +#ifdef LL_USESYSTEMLIBS + dom = static_cast(dae.openFromMemory(uri_filename, preprocessDAE(filename).c_str())); +#else dom = dae.openFromMemory(uri_filename, preprocessDAE(filename).c_str()); +#endif } else { LL_INFOS() << "Skipping dae preprocessing" << LL_ENDL; +#ifdef LL_USESYSTEMLIBS + dom = static_cast(dae.open(uri_filename)); +#else dom = dae.open(uri_filename); +#endif } if (!dom) -- cgit v1.2.3