keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

fixed NPE during loading of B3D models without textures/brushes. 

changed default B3D color to have full opacity.
This commit is contained in:
RainWarrior 2015-02-08 13:48:48 +03:00
parent f0d96b7c50
commit 9e90febd37
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/minecraftforge/client/model/b3d/B3DLoader.java
View File

@ -498,7 +498,7 @@ public class B3DLoader implements ICustomModelLoader
}
else
{
put(e, 1, 1, 1, 0);
put(e, 1, 1, 1, 1);
}
break;
case UV:

5
src/main/java/net/minecraftforge/client/model/b3d/B3DModel.java
View File

@ -9,6 +9,7 @@ import java.nio.channels.FileChannel;
import java.util.ArrayDeque;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Deque;
import java.util.HashMap;
import java.util.HashSet;
@ -187,8 +188,8 @@ public class B3DModel
throw new IOException("Unsupported major model version: " + ((float)version / 100));
if(version % 100 > this.version % 100)
logger.warn(String.format("Minor version differnce in model: ", ((float)version / 100)));
List<Texture> textures = null;
List<Brush> brushes = null;
List<Texture> textures = Collections.EMPTY_LIST;
List<Brush> brushes = Collections.EMPTY_LIST;
Node<?> root = null;
while(buf.hasRemaining())
{