From 75e7146c5bedb0b0c445a604a750bb555ffe3547 Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Wed, 6 Sep 2017 09:49:33 -0700
Subject: [PATCH] Fix polyline crash and flicker

---
 .../entities-renderer/src/RenderablePolyLineEntityItem.cpp     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
index 3db7fb2c30..1cecb0b036 100644
--- a/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
+++ b/libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp
@@ -126,6 +126,7 @@ void PolyLineEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer&
         auto textures = entity->getTextures();
         QString path = textures.isEmpty() ? PathUtils::resourcesPath() + "images/paintStroke.png" : textures;
         if (!_texture || _lastTextures != path) {
+            _lastTextures = path;
             _texture = DependencyManager::get<TextureCache>()->getTexture(QUrl(path));
         }
     }
@@ -220,7 +221,7 @@ void PolyLineEntityRenderer::doRender(RenderArgs* args) {
     batch.setModelTransform(Transform{ _modelTransform }.setScale(vec3(1)));
     batch.setUniformBuffer(PAINTSTROKE_UNIFORM_SLOT, _uniformBuffer);
 
-    if (_texture->isLoaded()) {
+    if (_texture && _texture->isLoaded()) {
         batch.setResourceTexture(PAINTSTROKE_TEXTURE_SLOT, _texture->getGPUTexture());
     } else {
         batch.setResourceTexture(PAINTSTROKE_TEXTURE_SLOT, nullptr);