From 2fac1ddf2cc26ad51bdd791a6977e0fa74ae6f75 Mon Sep 17 00:00:00 2001 From: Dale Glass Date: Sat, 26 Sep 2020 22:58:44 +0200 Subject: [PATCH 1/2] Add missing 'override' MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: warning: ‘virtual void render::entities::GizmoEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer&, render::Transaction&, const TypedEntityPointer&)’ can be marked override [-Wsuggest-override] --- libraries/entities-renderer/src/RenderableGizmoEntityItem.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/entities-renderer/src/RenderableGizmoEntityItem.h b/libraries/entities-renderer/src/RenderableGizmoEntityItem.h index e3d84a0201..8593348bde 100644 --- a/libraries/entities-renderer/src/RenderableGizmoEntityItem.h +++ b/libraries/entities-renderer/src/RenderableGizmoEntityItem.h @@ -29,7 +29,7 @@ protected: bool isTransparent() const override; private: - virtual void doRenderUpdateSynchronousTyped(const ScenePointer& scene, Transaction& transaction, const TypedEntityPointer& entity); + virtual void doRenderUpdateSynchronousTyped(const ScenePointer& scene, Transaction& transaction, const TypedEntityPointer& entity) override; virtual void doRenderUpdateAsynchronousTyped(const TypedEntityPointer& entity) override; virtual void doRender(RenderArgs* args) override; From 8761b26079779cb3033d266b4a2bd9a58f4c0049 Mon Sep 17 00:00:00 2001 From: Dale Glass Date: Sat, 26 Sep 2020 23:01:05 +0200 Subject: [PATCH 2/2] Remove unused variable --- libraries/fbx/src/GLTFSerializer.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/libraries/fbx/src/GLTFSerializer.cpp b/libraries/fbx/src/GLTFSerializer.cpp index 3a0271945b..4f6ec2d1b2 100755 --- a/libraries/fbx/src/GLTFSerializer.cpp +++ b/libraries/fbx/src/GLTFSerializer.cpp @@ -1628,7 +1628,6 @@ bool GLTFSerializer::buildGeometry(HFMModel& hfmModel, const hifi::VariantHash& // Mesh extents must be at least a minimum size, in particular for blendshapes to work on planar meshes. const float MODEL_MIN_DIMENSION = 0.001f; - auto x = EPSILON; auto delta = glm::max(glm::vec3(MODEL_MIN_DIMENSION) - mesh.meshExtents.size(), glm::vec3(0.0f)) / 2.0f; mesh.meshExtents.minimum -= delta; mesh.meshExtents.maximum += delta;