From 7bcc70a170d0afa1f7fa36bebeaa16d56eb1776b Mon Sep 17 00:00:00 2001 From: Ian Curtis Date: Mon, 1 Oct 2018 17:42:45 +0000 Subject: [PATCH] Update makefile --- Makefiles/Makefile.inc | 2 ++ Src/Graphics/New3D/Model.h | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefiles/Makefile.inc b/Makefiles/Makefile.inc index 5af3dd9..225d116 100644 --- a/Makefiles/Makefile.inc +++ b/Makefiles/Makefile.inc @@ -94,6 +94,8 @@ SRC_FILES = \ Src/Graphics/Legacy3D/Legacy3D.cpp \ Src/Graphics/Legacy3D/Models.cpp \ Src/Graphics/Legacy3D/TextureRefs.cpp \ + Src/Graphics/New3D/GLSLShader.cpp \ + Src/Graphics/New3D/R3DFrameBuffers.cpp \ Src/Graphics/New3D/New3D.cpp \ Src/Graphics/New3D/Mat4.cpp \ Src/Graphics/New3D/Model.cpp \ diff --git a/Src/Graphics/New3D/Model.h b/Src/Graphics/New3D/Model.h index e6c1b59..4e78daa 100644 --- a/Src/Graphics/New3D/Model.h +++ b/Src/Graphics/New3D/Model.h @@ -113,12 +113,12 @@ struct Mesh } break; case Layer::trans1: - if (!textureAlpha && !polyAlpha || transLSelect) { + if ((!textureAlpha && !polyAlpha) || transLSelect) { return false; } break; case Layer::trans2: - if (!textureAlpha && !polyAlpha || !transLSelect) { + if ((!textureAlpha && !polyAlpha) || !transLSelect) { return false; } break;