From 08110be9f742b3167ff9bd6906b35e59d3595b4a Mon Sep 17 00:00:00 2001 From: Turo Lamminen Date: Thu, 16 Jan 2020 13:41:01 +0200 Subject: [PATCH 1/3] Revert BoxTextured.glb to working version --- .../BoxTextured-glTF-Binary/BoxTextured.glb | Bin 4695 -> 4696 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/test/models/glTF2/BoxTextured-glTF-Binary/BoxTextured.glb b/test/models/glTF2/BoxTextured-glTF-Binary/BoxTextured.glb index 19b5546b04f56818f70f8bf809863ec8853b72f1..03cd2acf941a0838722aa3e7243d33a8f459c22e 100644 GIT binary patch delta 14 Vcmcbvazkaq4Gu=$%{MseIRP+R1+f4C delta 12 Tcmcbia$RM^4UWw>IqEq9DEtMa From 2a366388c2f9326c5f8f515dd21251ef19ef9212 Mon Sep 17 00:00:00 2001 From: Turo Lamminen Date: Thu, 16 Jan 2020 13:55:34 +0200 Subject: [PATCH 2/3] Revert Wuson.ms3d to working version --- test/models/MS3D/Wuson.ms3d | Bin 330211 -> 330213 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/test/models/MS3D/Wuson.ms3d b/test/models/MS3D/Wuson.ms3d index e78cbaa58e0ded211393ecea424f8b8e6ade237f..2fc79ac82666277998e21202ce5914e971c93561 100644 GIT binary patch delta 33 ocmaDnS>)+tk%kt=7N!>FEi6}h70$Z73Z&0WVi7L~0PANB8~^|S delta 29 lcmaDlS>*9#k%kt=7N!>FEi6}hwqNaG`N6vV+$0w9asbB|4FdoG From 89e622060b02a5911bdabcb64afdd8a20c16c0e8 Mon Sep 17 00:00:00 2001 From: Turo Lamminen Date: Thu, 16 Jan 2020 14:02:04 +0200 Subject: [PATCH 3/3] Preserve more exceptions in Half-Life MDL loader --- code/MDL/HalfLife/HL1MDLLoader.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/MDL/HalfLife/HL1MDLLoader.cpp b/code/MDL/HalfLife/HL1MDLLoader.cpp index 785183950..90a1479a3 100644 --- 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; } }