From b75593b0c65458107d076daa524604669f5ddb87 Mon Sep 17 00:00:00 2001 From: RainWarrior Date: Tue, 27 Oct 2015 18:31:12 +0300 Subject: [PATCH] Fixed AO being applied to OBJ model transparency, and OBJ loader trying to force the loading of the builtin white texture. --- .../java/net/minecraftforge/client/model/obj/OBJModel.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/minecraftforge/client/model/obj/OBJModel.java b/src/main/java/net/minecraftforge/client/model/obj/OBJModel.java index abec3c3827..bf4c069a02 100644 --- a/src/main/java/net/minecraftforge/client/model/obj/OBJModel.java +++ b/src/main/java/net/minecraftforge/client/model/obj/OBJModel.java @@ -90,7 +90,7 @@ public class OBJModel implements IRetexturableModel, IModelCustomData { Material mat = materialIterator.next(); ResourceLocation textureLoc = new ResourceLocation(mat.getTexture().getPath()); - if (!textures.contains(textureLoc)) + if (!textures.contains(textureLoc) && !mat.isWhite()) textures.add(textureLoc); } return textures; @@ -1423,7 +1423,7 @@ public class OBJModel implements IRetexturableModel, IModelCustomData break; case COLOR: float d = LightUtil.diffuseLight(n.normal.x, n.normal.y, n.normal.z); - if (v.getMaterial() != null) builder.put(e, d * v.getMaterial().getColor().x, d * v.getMaterial().getColor().y, d * v.getMaterial().getColor().z, d * v.getMaterial().getColor().w); + if (v.getMaterial() != null) builder.put(e, d * v.getMaterial().getColor().x, d * v.getMaterial().getColor().y, d * v.getMaterial().getColor().z, v.getMaterial().getColor().w); else builder.put(e, d, d, d, 1); break; case UV: