Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-06 10:32:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

checkpoint

Browse source
This commit is contained in:
howard-stearns 2017-01-16 12:47:26 -08:00
parent 831d01c23a
commit 09a57efaf3
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/entities/src/EntityTree.cpp
View file

@ -932,6 +932,7 @@ bool EntityTree::filterProperties(const EntityItemProperties& propertiesIn, Enti
return true; // allowed return true; // allowed
} }
QScriptValue inputValues = propertiesIn.copyToScriptValue(&_entityEditFilterEngine, true, true); QScriptValue inputValues = propertiesIn.copyToScriptValue(&_entityEditFilterEngine, true, true);
qDebug() << "input" << propertiesIn << inputValues.toVariant();
QScriptValueList args; QScriptValueList args;
args << inputValues; args << inputValues;
@ -1032,8 +1033,9 @@ int EntityTree::processEditPacketData(ReceivedMessage& message, const unsigned c
bool wasChanged = false; bool wasChanged = false;
bool allowed = filterProperties(properties, properties, wasChanged); bool allowed = filterProperties(properties, properties, wasChanged);
if (!allowed) { if (!allowed) {
properties = EntityItemProperties(); // Maybe other behavior properties = EntityItemProperties();
} else if (wasChanged) { }
if (!allowed || wasChanged) {
if (properties.getLastEdited() == UNKNOWN_CREATED_TIME) { if (properties.getLastEdited() == UNKNOWN_CREATED_TIME) {
properties.setLastEdited(usecTimestampNow()); properties.setLastEdited(usecTimestampNow());
} }