diff options
| author | Erik Kundiman <erik@megapahit.org> | 2023-07-12 17:20:48 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2023-07-19 14:56:50 +0800 |
| commit | 9dd2b858e8a60c8f31a491b04d7d0388fb80a852 (patch) | |
| tree | 1355fa499dc2970e670098f095935ac4b3749772 /indra/llprimitive/lldaeloader.cpp | |
| parent | 08b0528312c8dc90c7564634909ef49752a4f90a (diff) | |
Cast COLLADA dom instance as instructed on its doc
which can be found too in the system COLLADA DOM headers.
Diffstat (limited to 'indra/llprimitive/lldaeloader.cpp')
| -rw-r--r-- | indra/llprimitive/lldaeloader.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
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<domCOLLADA *>(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<domCOLLADA *>(dae.open(uri_filename)); +#else dom = dae.open(uri_filename); +#endif } if (!dom) |