소스 검색

fix for NPE when being called from CombinedTexture with null baseImage (#1146)

* fix for NPE when being called from CombinedTexture with null baseImage

* formating only
empirephoenix 6 년 전
부모
커밋
0e2a19c826
1개의 변경된 파일8개의 추가작업 그리고 2개의 파일을 삭제
  1. 8 2
      jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/blending/TextureBlenderAWT.java

+ 8 - 2
jme3-blender/src/main/java/com/jme3/scene/plugins/blender/textures/blending/TextureBlenderAWT.java

@@ -142,8 +142,14 @@ public class TextureBlenderAWT extends AbstractTextureBlender {
             }
             dataArray.add(newData);
         }
-
-        ColorSpace colorSpace = baseImage.getColorSpace() != null ? baseImage.getColorSpace() : ColorSpace.Linear;
+        
+        ColorSpace colorSpace;
+        if (baseImage != null) {
+            colorSpace = baseImage.getColorSpace() != null ? baseImage.getColorSpace() : ColorSpace.Linear;
+        } else {
+            colorSpace = image.getColorSpace();
+        }
+        
         Image result = depth > 1 ? new Image(Format.RGBA8, width, height, depth, dataArray, colorSpace) : new Image(Format.RGBA8, width, height, dataArray.get(0), colorSpace);
         if (image.getMipMapSizes() != null) {
             result.setMipMapSizes(image.getMipMapSizes().clone());