Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix build

Browse source
This commit is contained in:
HifiExperiments 2021-03-17 20:24:16 -07:00
parent 5fd4f215f1
commit 15ba6c8637
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/gpu/src/gpu/Texture.h
View file

@ -715,7 +715,7 @@ public:
void resetTextureOperator(std::function<gpu::TexturePointer()> textureOperator);
bool isDefined() const;
std::function<gpu::TexturePointer()> TextureSource::getTextureOperator() const { return _gpuTextureOperator; }
std::function<gpu::TexturePointer()> getTextureOperator() const { return _gpuTextureOperator; }
protected:
gpu::TexturePointer _gpuTexture;

2
libraries/procedural/src/procedural/ReferenceMaterial.cpp
View file

@ -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 {