From 4cb4d59682e4136e27760d2b5427617e9d09e3f5 Mon Sep 17 00:00:00 2001
From: BuildTools <unconfigured@null.spigotmc.org>
Date: Thu, 11 Jan 2018 16:13:13 -0800
Subject: [PATCH] revert problematic unit test models to last upstream commits

---
 test/models/BLEND/AreaLight_269.blend         | Bin 498579 -> 498580 bytes
 test/models/BLEND/BlenderMaterial_269.blend   | Bin 503611 -> 503612 bytes
 test/models/BLEND/box.blend                   | Bin 453999 -> 454000 bytes
 test/models/FBX/spider.fbx                    | Bin 123291 -> 123292 bytes
 .../2CylinderEngine.glb                       | Bin 1838035 -> 1838084 bytes
 test/unit/utBlendImportAreaLight.cpp          |   2 --
 6 files changed, 2 deletions(-)

diff --git a/test/models/BLEND/AreaLight_269.blend b/test/models/BLEND/AreaLight_269.blend
index 43a293faf6279a76f4bb921d8d0d17ad0433494c..9337d5799adb12781e682f4af0373631df0e3731 100644
GIT binary patch
delta 31
mcmbQdU2e*DxrP?T7N!>F7M2#)7Pc+yYK4rv+tmu$bF~1lW(msx

delta 29
kcmbQTU2gJrxrP?T7N!>F7M2#)7Pc+yYK7a?3)yqE0HA3Jz5oCK

diff --git a/test/models/BLEND/BlenderMaterial_269.blend b/test/models/BLEND/BlenderMaterial_269.blend
index 9492ed4f051ae17864e5816b57fb41d790333872..4c00fec9d4a23200ffc72f496fcefa434381f6e1 100644
GIT binary patch
delta 31
ncmdmePj1gWxrP?T7N!>F7M2#)7Pc+y=UNzfx1Vca&(#6|%^VBg

delta 29
lcmdmUPj2@;xrP?T7N!>F7M2#)7Pc+y=UTR(Z(+~X0sy*g3(^1p

diff --git a/test/models/BLEND/box.blend b/test/models/BLEND/box.blend
index 26820b9cf66c708edf5dfabf564ba426c50a32af..28ebbcc1f173067d52efc07a120118f8affa8761 100644
GIT binary patch
delta 29
lcmaEVOZvkt>4p}@7N!>F7M2#)Eo^058F{ytZDspu4gkQL3-|y4

delta 27
jcmexxOZxpS>4p}@7N!>F7M2#)Eo^05x0i2a`)LjUuAB?&

diff --git a/test/models/FBX/spider.fbx b/test/models/FBX/spider.fbx
index a6fbc89425b1b9475b40954b12945dee18caf57e..cc5a38798a162b4b6f1a7f3a1d2df69e334f104c 100644
GIT binary patch
delta 19
ZcmbPzn0?M+_J%Eto#KqV+ku48DF96y2IBw#

delta 17
ZcmbPpn0@wP_J%Eto#NZO#2JN70RTgO2G#%o

diff --git a/test/models/glTF2/2CylinderEngine-glTF-Binary/2CylinderEngine.glb b/test/models/glTF2/2CylinderEngine-glTF-Binary/2CylinderEngine.glb
index 06c79f46cab84c6441a427299e619b36cc0752e5..0e9b10568c74ce93743161c76dd6d8c1428bd48b 100644
GIT binary patch
delta 311
zcmYLDyGjE=6lLRTva@qHnrt$&JC%)p5UhfQ;Liw>I+eu%3sD3EYwtE;Tj4e~7Pc0q
ziXRZL$sY*boA}_snR6fK+*wo;JWMVTp@kj9*u@^&=pcbX3JXGpF7|PN9{R{Jz!2`q
zPon`DYcfLu<;-+dSL2lrTt_|{CQ^0;hPZJaZ>bvWcAbw`K6cWfM4-&4U;ge^^iL=+
zuZwqgxS8pmA?1|pMk`w)VSafmE<VM#PS%>lqnmQ(oT%;XU$4HF_@gdIahpthPcyp8
h=OyR!U|auptD`2INZAu;+<6n~Ld}04b+6(1>>Iw-J^=s#

delta 272
zcmYk0Jxc>Y5Qe#US#Rfd_e`R9d$;}#yMSG=HIRQ`Evc<6Ua$~9z`$v(79nkL8o|oe
z#@<E{Z1N8j=e$Chd8T@J-@*0twVoa$LI-Pz(S^b~5@--o7+5%D*gy|`46unU<S3T@
zD9Xr?BWiGz5%ERjw{t}{u?g|A@OW{em|r6k$JJs4KKStOc|ulOEr-Wn{_<S4S@r%R
z4EX!Bd@AxrNQnfSS_u(k`R%qm{8Y5kD@{B(t7b*7ZEWR6HxKvKPTZyV%Fa%P^NNS_
ZU^@RQb`|wyh;J6*uKast?>Rh<egL=(K1cun

diff --git a/test/unit/utBlendImportAreaLight.cpp b/test/unit/utBlendImportAreaLight.cpp
index 7bc55c361..55a68b040 100644
--- a/test/unit/utBlendImportAreaLight.cpp
+++ b/test/unit/utBlendImportAreaLight.cpp
@@ -46,7 +46,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <assimp/Importer.hpp>
 #include <assimp/scene.h>
 #include <assimp/postprocess.h>
-#include <iostream>
 
 class BlendImportAreaLight : public ::testing::Test {
 public:
@@ -70,7 +69,6 @@ protected:
 TEST_F(BlendImportAreaLight, testImportLight)
 {
     const aiScene* pTest = im->ReadFile(ASSIMP_TEST_MODELS_DIR "/BLEND/AreaLight_269.blend", aiProcess_ValidateDataStructure);
-    if (!pTest) std::cerr << im->GetErrorString() << '\n'; // temporary, for pull req. diagnostics
     ASSERT_TRUE(pTest != NULL);
     ASSERT_TRUE(pTest->HasLights());