From e78ece7fc5e64ec225807924d39ebe070d72e3c6 Mon Sep 17 00:00:00 2001 From: HifiExperiments Date: Mon, 17 Aug 2020 14:16:41 -0700 Subject: [PATCH] CR --- libraries/entities-renderer/src/EntityTreeRenderer.cpp | 2 +- libraries/render-utils/src/Model.cpp | 4 ++-- libraries/render-utils/src/Model.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/entities-renderer/src/EntityTreeRenderer.cpp b/libraries/entities-renderer/src/EntityTreeRenderer.cpp index 51178fea1b..b5ed4b767d 100644 --- a/libraries/entities-renderer/src/EntityTreeRenderer.cpp +++ b/libraries/entities-renderer/src/EntityTreeRenderer.cpp @@ -496,7 +496,7 @@ void EntityTreeRenderer::updateChangedEntities(const render::ScenePointer& scene } // compute average per-renderable update cost - _prevNumEntityUpdates = sortedRenderables.size() - _renderablesToUpdate.size(); + _prevNumEntityUpdates = sortedRenderables.size() - _renderablesToUpdate.size(); size_t numUpdated = _prevNumEntityUpdates + 1; // add one to avoid divide by zero float cost = (float)(usecTimestampNow() - updateStart) / (float)(numUpdated); const float BLEND = 0.1f; diff --git a/libraries/render-utils/src/Model.cpp b/libraries/render-utils/src/Model.cpp index 92c9b4fafb..182b83762c 100644 --- a/libraries/render-utils/src/Model.cpp +++ b/libraries/render-utils/src/Model.cpp @@ -958,10 +958,10 @@ void Model::setCauterized(bool cauterized, const render::ScenePointer& scene) { } } -void Model::setPrimitiveMode(PrimitiveMode primitiveMode, const render::ScenePointer& scene) { +void Model::setPrimitiveMode(PrimitiveMode primitiveMode) { if (_primitiveMode != primitiveMode) { _primitiveMode = primitiveMode; - updateRenderItemsKey(scene); + updateRenderItemsKey(nullptr); } } diff --git a/libraries/render-utils/src/Model.h b/libraries/render-utils/src/Model.h index 0f65b62194..4585ad0009 100644 --- a/libraries/render-utils/src/Model.h +++ b/libraries/render-utils/src/Model.h @@ -118,7 +118,7 @@ public: bool isCauterized() const { return _cauterized; } void setCauterized(bool value, const render::ScenePointer& scene); - void setPrimitiveMode(PrimitiveMode primitiveMode, const render::ScenePointer& scene = nullptr); + void setPrimitiveMode(PrimitiveMode primitiveMode); PrimitiveMode getPrimitiveMode() const { return _primitiveMode; } void setCullWithParent(bool value);