From 956e70e415471bd58c4e55364ff907cda8118da4 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Tue, 26 Jan 2016 22:07:05 +1300 Subject: [PATCH 1/2] Make entity properties return undefined value after entity is deleted --- libraries/entities/src/EntityItemProperties.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp index 0ccd6a74bd..0a72789485 100644 --- a/libraries/entities/src/EntityItemProperties.cpp +++ b/libraries/entities/src/EntityItemProperties.cpp @@ -321,6 +321,11 @@ QScriptValue EntityItemProperties::copyToScriptValue(QScriptEngine* engine, bool QScriptValue properties = engine->newObject(); EntityItemProperties defaultEntityProperties; + if (_created == UNKNOWN_CREATED_TIME) { + // No entity properties can have been set so return without setting any default, zero property values. + return properties; + } + if (_idSet) { COPY_PROPERTY_TO_QSCRIPTVALUE_GETTER_ALWAYS(id, _id.toString()); } From 2834dee00d46c66d05d687d5100fca998f41808e Mon Sep 17 00:00:00 2001 From: David Rowe Date: Tue, 26 Jan 2016 22:07:42 +1300 Subject: [PATCH 2/2] Remove erroneous edit.js call with missing entity ID --- examples/libraries/entitySelectionTool.js | 1 - 1 file changed, 1 deletion(-) diff --git a/examples/libraries/entitySelectionTool.js b/examples/libraries/entitySelectionTool.js index 94ffb48a71..c1675ef044 100644 --- a/examples/libraries/entitySelectionTool.js +++ b/examples/libraries/entitySelectionTool.js @@ -1515,7 +1515,6 @@ SelectionDisplay = (function() { } that.updateRotationHandles(); - that.highlightSelectable(); var rotation, dimensions, position, registrationPoint;