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

made renderLayer ThreadLocal, now it should hold correct value for use inside custom baked models

This commit is contained in:
RainWarrior 2015-02-09 02:46:01 +03:00
parent 9a6fb600ec
commit 2419d4913b
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/net/minecraftforge/client/ForgeHooksClient.java
View File

@ -295,10 +295,17 @@ public class ForgeHooksClient
renderPass = pass;
}
static EnumWorldBlockLayer renderLayer = EnumWorldBlockLayer.SOLID;
static final ThreadLocal<EnumWorldBlockLayer> renderLayer = new ThreadLocal<EnumWorldBlockLayer>()
{
protected EnumWorldBlockLayer initialValue()
{
return EnumWorldBlockLayer.SOLID;
}
};
public static void setRenderLayer(EnumWorldBlockLayer layer)
{
renderLayer = layer;
renderLayer.set(layer);
}
public static ModelBase getArmorModel(EntityLivingBase entityLiving, ItemStack itemStack, int slotID, ModelBase _default)

2
src/main/java/net/minecraftforge/client/MinecraftForgeClient.java
View File

@ -49,7 +49,7 @@ public class MinecraftForgeClient
public static EnumWorldBlockLayer getRenderLayer()
{
return ForgeHooksClient.renderLayer;
return ForgeHooksClient.renderLayer.get();
}
private static BitSet stencilBits = new BitSet(8);