Merge branch 'master' into master

2020-01-17 08:17:45 +01:00 · 2020-01-17 08:17:45 +01:00 · bdbe111abd
parent 986c18501a e5864aaf5b
commit bdbe111abd
3 changed files with 2 additions and 2 deletions
--- a/code/MDL/HalfLife/HL1MDLLoader.cpp
+++ b/code/MDL/HalfLife/HL1MDLLoader.cpp
@ -175,9 +175,9 @@ void HL1MDLLoader::load_file() {

        release_resources();

-    } catch (const std::exception &e) {
+    } catch (...) {
        release_resources();
-        throw e;
+        throw;
    }
 }

--- a/test/models/MS3D/Wuson.ms3d
+++ b/test/models/MS3D/Wuson.ms3d
--- a/test/models/glTF2/BoxTextured-glTF-Binary/BoxTextured.glb
+++ b/test/models/glTF2/BoxTextured-glTF-Binary/BoxTextured.glb