Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 21:12:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix build error

Browse source
This commit is contained in:
SamGondelman 2019-02-15 16:44:28 -08:00
parent 3df231f1e0
commit 6bf1545285
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libraries/entities-renderer/src/RenderableMaterialEntityItem.cpp
View file

@ -106,7 +106,7 @@ void MaterialEntityRenderer::doRenderUpdateAsynchronousTyped(const TypedEntityPo
} }
{ {
auto& material = getMaterial(); auto material = getMaterial();
// Update the old material regardless of if it's going to change // Update the old material regardless of if it's going to change
if (transformChanged && material && !_parentID.isNull()) { if (transformChanged && material && !_parentID.isNull()) {
applyTextureTransform(material); applyTextureTransform(material);
@ -207,7 +207,7 @@ void MaterialEntityRenderer::doRenderUpdateAsynchronousTyped(const TypedEntityPo
} }
{ {
auto& material = getMaterial(); auto material = getMaterial();
bool newTexturesLoaded = material ? !material->isMissingTexture() : false; bool newTexturesLoaded = material ? !material->isMissingTexture() : false;
if (!_texturesLoaded && newTexturesLoaded) { if (!_texturesLoaded && newTexturesLoaded) {
material->checkResetOpacityMap(); material->checkResetOpacityMap();
@ -230,7 +230,7 @@ ItemKey MaterialEntityRenderer::getKey() {
builder.withInvisible(); builder.withInvisible();
} }
const auto& drawMaterial = getMaterial(); const auto drawMaterial = getMaterial();
if (drawMaterial) { if (drawMaterial) {
auto matKey = drawMaterial->getKey(); auto matKey = drawMaterial->getKey();
if (matKey.isTranslucent()) { if (matKey.isTranslucent()) {
@ -243,7 +243,7 @@ ItemKey MaterialEntityRenderer::getKey() {
ShapeKey MaterialEntityRenderer::getShapeKey() { ShapeKey MaterialEntityRenderer::getShapeKey() {
graphics::MaterialKey drawMaterialKey; graphics::MaterialKey drawMaterialKey;
const auto& drawMaterial = getMaterial(); const auto drawMaterial = getMaterial();
if (drawMaterial) { if (drawMaterial) {
drawMaterialKey = drawMaterial->getKey(); drawMaterialKey = drawMaterial->getKey();
} }
@ -376,7 +376,7 @@ void MaterialEntityRenderer::applyTextureTransform(std::shared_ptr<NetworkMateri
void MaterialEntityRenderer::applyMaterial() { void MaterialEntityRenderer::applyMaterial() {
_retryApply = false; _retryApply = false;
std::shared_ptr<NetworkMaterial>& material = getMaterial(); std::shared_ptr<NetworkMaterial> material = getMaterial();
QUuid parentID = _parentID; QUuid parentID = _parentID;
if (!material || parentID.isNull()) { if (!material || parentID.isNull()) {
_appliedMaterial = nullptr; _appliedMaterial = nullptr;