diff --git a/src/main/java/net/minecraftforge/client/model/ModelLoader.java b/src/main/java/net/minecraftforge/client/model/ModelLoader.java index 8e79f8fbf6..63e7128edb 100644 --- a/src/main/java/net/minecraftforge/client/model/ModelLoader.java +++ b/src/main/java/net/minecraftforge/client/model/ModelLoader.java @@ -217,13 +217,20 @@ public class ModelLoader extends ModelBakery throw new IllegalStateException("circular model dependencies involving model " + location); } loadingModels.add(location); - IModel model = ModelLoaderRegistry.getModel(location); - for(ResourceLocation dep : model.getDependencies()) + try { - getModel(dep); + IModel model = ModelLoaderRegistry.getModel(location); + for (ResourceLocation dep : model.getDependencies()) + { + getModel(dep); + + } + textures.addAll(model.getTextures()); + } + finally + { + loadingModels.remove(location); } - textures.addAll(model.getTextures()); - loadingModels.remove(location); } private class VanillaModelWrapper implements IRetexturableModel