diff --git a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/terrain/GlDhTerrainShaderProgram.java b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/terrain/GlDhTerrainShaderProgram.java index e92acbf05..d699ff9e7 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/terrain/GlDhTerrainShaderProgram.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/render/openGl/terrain/GlDhTerrainShaderProgram.java @@ -294,6 +294,10 @@ public class GlDhTerrainShaderProgram extends GlShaderProgram implements IDhApiS GLMC.disableBlend(); } + // needs to be explicitly called since Iris may disable color rendering and not re-enable it + // when boats are rendered in the scene (due to rendering out water inside the boat) + GL32.glColorMask(true, true, true, true); + // needs to be triggered after DH attempts to set the GL state so that Iris // can override it as needed ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeRenderPassEvent.class, renderEventParam.apiCopy); diff --git a/coreSubProjects b/coreSubProjects index ea4375b21..0b802ca36 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit ea4375b215f02a43c412696903fb394705025c51 +Subproject commit 0b802ca3627f02664677e6d1160f57ed621c4801