From 769454e964b1558dddb11dedd62a31fc38957a22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A4r=20Winzell?= <par.winzell@alyx.com>
Date: Sun, 7 Apr 2019 15:18:13 -0700
Subject: [PATCH] This all needs rewriting, but at least let's make it not
 crash on Windows.

---
 src/gltf/TextureBuilder.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/gltf/TextureBuilder.cpp b/src/gltf/TextureBuilder.cpp
index 32873ff..4329c5f 100644
--- a/src/gltf/TextureBuilder.cpp
+++ b/src/gltf/TextureBuilder.cpp
@@ -89,11 +89,10 @@ std::shared_ptr<TextureData> TextureBuilder::combine(
   int channels = includeAlphaChannel ? 4 : 3;
 
   std::vector<uint8_t> mergedPixels(static_cast<size_t>(channels * width * height));
-  std::vector<pixel> pixels(texes.size());
-  std::vector<const pixel*> pixelPointers(texes.size());
   for (int xx = 0; xx < width; xx++) {
     for (int yy = 0; yy < height; yy++) {
-      pixels.clear();
+      std::vector<pixel> pixels(texes.size());
+      std::vector<const pixel*> pixelPointers(texes.size(), nullptr);
       for (int jj = 0; jj < texes.size(); jj++) {
         const TexInfo& tex = texes[jj];
         // each texture's structure will depend on its channel count
@@ -216,4 +215,4 @@ std::shared_ptr<TextureData> TextureBuilder::simple(int rawTexIndex, const std::
       new TextureData(textureName, *gltf.defaultSampler, *gltf.images.hold(image)));
   textureByIndicesKey.insert(std::make_pair(key, texDat));
   return texDat;
-}
\ No newline at end of file
+}