From 15ba6c8637fece74acd9beb67638b732533e32be Mon Sep 17 00:00:00 2001 From: HifiExperiments Date: Wed, 17 Mar 2021 20:24:16 -0700 Subject: [PATCH] fix build --- libraries/gpu/src/gpu/Texture.h | 2 +- libraries/procedural/src/procedural/ReferenceMaterial.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/gpu/src/gpu/Texture.h b/libraries/gpu/src/gpu/Texture.h index b8e284d470..63c2d4c0b6 100755 --- a/libraries/gpu/src/gpu/Texture.h +++ b/libraries/gpu/src/gpu/Texture.h @@ -715,7 +715,7 @@ public: void resetTextureOperator(std::function textureOperator); bool isDefined() const; - std::function TextureSource::getTextureOperator() const { return _gpuTextureOperator; } + std::function getTextureOperator() const { return _gpuTextureOperator; } protected: gpu::TexturePointer _gpuTexture; diff --git a/libraries/procedural/src/procedural/ReferenceMaterial.cpp b/libraries/procedural/src/procedural/ReferenceMaterial.cpp index acb9dd5369..a926c1f5ce 100644 --- a/libraries/procedural/src/procedural/ReferenceMaterial.cpp +++ b/libraries/procedural/src/procedural/ReferenceMaterial.cpp @@ -122,7 +122,7 @@ bool ReferenceMaterial::isReady() const { QString ReferenceMaterial::getProceduralString() const { auto material = getMaterial(); - return material ? material->getProceduralString() : false; + return material ? material->getProceduralString() : QString(); } glm::vec4 ReferenceMaterial::getColor(const glm::vec4& color) const {