From 472835d65c627285331f7639a2b1e172382afd27 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Wed, 19 Apr 2017 11:22:20 -0700
Subject: [PATCH] Port fix from master

---
 libraries/gpu-gl/src/gpu/gl/GLTexture.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libraries/gpu-gl/src/gpu/gl/GLTexture.cpp b/libraries/gpu-gl/src/gpu/gl/GLTexture.cpp
index 22743f106b..19891d3370 100644
--- a/libraries/gpu-gl/src/gpu/gl/GLTexture.cpp
+++ b/libraries/gpu-gl/src/gpu/gl/GLTexture.cpp
@@ -478,6 +478,10 @@ void GLVariableAllocationSupport::updateMemoryPressure() {
 
         // Populate the existing textures into the queue
         for (const auto& texture : strongTextures) {
+            // Race conditions can still leave nulls in the list, so we need to check
+            if (!texture) {
+                continue;
+            }
             addToWorkQueue(texture);
         }
     }