From 09a57efaf30bc292701e10c3a57cc2e51a60fff3 Mon Sep 17 00:00:00 2001 From: howard-stearns Date: Mon, 16 Jan 2017 12:47:26 -0800 Subject: [PATCH] checkpoint --- libraries/entities/src/EntityTree.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp index 47b59a1c19..8da21ea582 100644 --- a/libraries/entities/src/EntityTree.cpp +++ b/libraries/entities/src/EntityTree.cpp @@ -932,6 +932,7 @@ bool EntityTree::filterProperties(const EntityItemProperties& propertiesIn, Enti return true; // allowed } QScriptValue inputValues = propertiesIn.copyToScriptValue(&_entityEditFilterEngine, true, true); + qDebug() << "input" << propertiesIn << inputValues.toVariant(); QScriptValueList args; args << inputValues; @@ -1032,8 +1033,9 @@ int EntityTree::processEditPacketData(ReceivedMessage& message, const unsigned c bool wasChanged = false; bool allowed = filterProperties(properties, properties, wasChanged); if (!allowed) { - properties = EntityItemProperties(); // Maybe other behavior - } else if (wasChanged) { + properties = EntityItemProperties(); + } + if (!allowed || wasChanged) { if (properties.getLastEdited() == UNKNOWN_CREATED_TIME) { properties.setLastEdited(usecTimestampNow()); }