#6057: Light Texture Preview should display editor image if present

codereader · Aug 6, 2022 · 763e80c · 763e80c
1 parent 7c92156
commit 763e80c
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/radiant/ui/common/TexturePreviewCombo.cpp b/radiant/ui/common/TexturePreviewCombo.cpp
@@ -162,9 +162,9 @@ bool TexturePreviewCombo::_onRender()
         // This is an "ordinary" texture, take the editor image
         auto tex = shader->getEditorImage();
 
-        if (isLightTexture())
+        // If this is a light, take #the first layer texture, but prefer the editor image if we got one
+        if (isLightTexture() && !tex)
         {
-            // This is a light, take the first layer texture
             if (auto first = shader->firstLayer(); first)
             {
                 tex = shader->firstLayer()->getTexture();