浏览代码

Merge pull request #354 from Azaezel/alpha40_compositCreationCoughup

fix for empty r channel creation of composites crashing out
Brian Roberts 4 年之前
父节点
当前提交
6860bddf35
共有 1 个文件被更改,包括 4 次插入1 次删除
  1. 4 1
      Engine/source/gfx/gfxTextureManager.cpp

+ 4 - 1
Engine/source/gfx/gfxTextureManager.cpp

@@ -1196,7 +1196,10 @@ GFXTextureObject *GFXTextureManager::createCompositeTexture(GBitmap*bmp[4], U32
    {
       for (U32 y = 0; y < bmp[lastValidTex]->getHeight(); y++)
       {
-         rChan = bmp[0]->getChanelValueAt(x, y, inputKey[0]);
+         if (bmp[0])
+            rChan = bmp[0]->getChanelValueAt(x, y, inputKey[0]);
+         else
+            gChan = 255;
 
          if (bmp[1])
             gChan = bmp[1]->getChanelValueAt(x, y, inputKey[1]);