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

Add an extra error check for OBJ model materials (#4402)

This commit is contained in:
Xander 2017-09-17 12:17:12 +08:00 committed by mezz
parent 9717882563
commit ce49596014
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/net/minecraftforge/client/model/obj/OBJModel.java
View File

@ -251,8 +251,15 @@ public class OBJModel implements IModel
this.materialLibrary.parseMaterials(manager, data, objFrom); this.materialLibrary.parseMaterials(manager, data, objFrom);
} }
else if (key.equalsIgnoreCase("usemtl")) else if (key.equalsIgnoreCase("usemtl"))
{
if (this.materialLibrary.materials.containsKey(data))
{ {
material = this.materialLibrary.materials.get(data); material = this.materialLibrary.materials.get(data);
}
else
{
FMLLog.log.error("OBJModel.Parser: (Model: '{}', Line: {}) material '{}' referenced but was not found", objFrom, lineNum, data);
}
usemtlCounter++; usemtlCounter++;
} }
else if (key.equalsIgnoreCase("v")) // Vertices: x y z [w] - w Defaults to 1.0 else if (key.equalsIgnoreCase("v")) // Vertices: x y z [w] - w Defaults to 1.0