From 5ed0ff729b5f85de90d6bcdae84de54a2eca6f6c Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Mon, 27 Mar 2017 07:25:40 -0700 Subject: [PATCH] cleanups --- libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp | 2 +- libraries/entities/src/EntityScriptingInterface.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp index 7b0146f5b7..5127739357 100644 --- a/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderablePolyVoxEntityItem.cpp @@ -446,7 +446,6 @@ bool RenderablePolyVoxEntityItem::setSphere(glm::vec3 centerWorldCoords, float r } }); - if (result) { compressVolumeDataAndSendEditPacket(); } @@ -773,6 +772,7 @@ void RenderablePolyVoxEntityItem::render(RenderArgs* args) { 0, sizeof(PolyVox::PositionMaterialNormal)); + // TODO -- should we be setting this? // batch.setInputBuffer(gpu::Stream::NORMAL, mesh->getVertexBuffer()._buffer, // 12, // sizeof(PolyVox::PositionMaterialNormal)); diff --git a/libraries/entities/src/EntityScriptingInterface.cpp b/libraries/entities/src/EntityScriptingInterface.cpp index 0888dd4fb9..4cf4bf8c67 100644 --- a/libraries/entities/src/EntityScriptingInterface.cpp +++ b/libraries/entities/src/EntityScriptingInterface.cpp @@ -1663,7 +1663,7 @@ void EntityScriptingInterface::getMeshes(QUuid entityID, QScriptValue callback) EntityItemPointer entity = static_cast(_entityTree->findEntityByEntityItemID(entityID)); if (!entity) { qCDebug(entities) << "EntityScriptingInterface::getMeshes no entity with ID" << entityID; - QScriptValueList args { false, false }; + QScriptValueList args { callback.engine()->undefinedValue(), false }; callback.call(QScriptValue(), args); return; }