From 44cbe5533920b8c1c0f13b5d5c16b46f75687fb4 Mon Sep 17 00:00:00 2001 From: Luke Lau Date: Thu, 20 Feb 2020 16:58:15 +0000 Subject: [PATCH] Fix stupid typo --- Makefile | 2 +- material.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 97ea923..c74b100 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ all: bin/main -CXX_FLAGS := -g --std=c++17 -march=native -Wall -DDEBUG_NODES +CXX_FLAGS := -g --std=c++17 -march=native -Wall bin/main: model.o material.o image.o skybox.o program.o ik.o main.o util.o clang++ $(CXX_FLAGS) $^ \ diff --git a/material.cpp b/material.cpp index a1d44be..00f98c2 100644 --- a/material.cpp +++ b/material.cpp @@ -62,7 +62,7 @@ Material::Texture::Texture(const aiString fileName, const aiScene &scene) { } void Material::bind() const { - if (ambientOcclusion != nullptr) { + if (albedo != nullptr) { glUniform1i(glGetUniformLocation(progId, "mat.albedoMap"), 0); glActiveTexture(GL_TEXTURE0); glBindTexture(GL_TEXTURE_2D, albedo->texId); -- 2.30.2