Add setting disableCustomVertexFormats

ChiselsAndBits · Dec 28, 2017 · e7a724d · e7a724d
1 parent 87af63c
commit e7a724d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/main/java/mod/chiselsandbits/config/ModConfig.java b/src/main/java/mod/chiselsandbits/config/ModConfig.java
@@ -153,6 +153,9 @@ public class ModConfig extends Configuration
 	@Configured( category = "Client Performance Settings" )
 	public static UseVBO useVBO;
 
+	@Configured( category = "Client Performance Settings" )
+	public boolean disableCustomVertexFormats;
+
 	@Configured( category = "Client Performance Settings" )
 	public int maxMillisecondsPerBlock = 10;
 
@@ -361,6 +364,7 @@ private void setDefaults()
 		defaultToDynamicRenderer = false;
 		dynamicRenderFullChunksOnly = true;
 		useVBO = UseVBO.AUTOMATIC;
+		disableCustomVertexFormats = false;
 
 		showUsage = true;
 		invertBitBagFullness = false;

diff --git a/src/main/java/mod/chiselsandbits/render/chiseledblock/ChiseledBlockSmartModel.java b/src/main/java/mod/chiselsandbits/render/chiseledblock/ChiseledBlockSmartModel.java
@@ -14,6 +14,7 @@
 import mod.chiselsandbits.chiseledblock.data.VoxelBlobStateInstance;
 import mod.chiselsandbits.chiseledblock.data.VoxelBlobStateReference;
 import mod.chiselsandbits.chiseledblock.data.VoxelNeighborRenderTracker;
+import mod.chiselsandbits.core.ChiselsAndBits;
 import mod.chiselsandbits.helpers.ModUtil;
 import mod.chiselsandbits.interfaces.ICacheClearable;
 import mod.chiselsandbits.render.BaseSmartModel;
@@ -112,7 +113,7 @@ private static VertexFormat getModelFormat()
 
 	private static boolean ForgePipelineDisabled()
 	{
-		return FMLClientHandler.instance().hasOptifine() || !ForgeModContainer.forgeLightPipelineEnabled;
+		return FMLClientHandler.instance().hasOptifine() || !ForgeModContainer.forgeLightPipelineEnabled || ChiselsAndBits.getConfig().disableCustomVertexFormats;
 	}
 
 	private static ChiseledBlockBaked getCachedModel(