History

Add FIXME comment to change to allow uknown enity edits

Ryan Huffman committed 10 years ago

Commit c0c060e1 parent 2f7e3461 file · +9 −0Browse files

Showing the changes to libraries/entities/src/EntityScriptingInterface.cpp (1 of 1 file). Show all

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+9−0
@@ -386,6 +386,15 @@ QUuid EntityScriptingInterface::editEntity(QUuid id, const EntityItemProperties& · 385 unmodified lines
386 }386 }
387 });387 });
388 388
389 // FIXME: We need to figure out a better way to handle this. Allowing these edits to go through potentially
390 // breaks avatar energy and entities that are parented.
391 //
392 // To handle cases where a script needs to edit an entity with a _known_ entity id but doesn't exist
393 // in the local entity tree, we need to allow those edits to go through to the server.
394 // if (!updatedEntity) {
395 // return QUuid();
396 // }
397
389 _entityTree->withReadLock([&] {398 _entityTree->withReadLock([&] {
390 EntityItemPointer entity = _entityTree->findEntityByEntityItemID(entityID);399 EntityItemPointer entity = _entityTree->findEntityByEntityItemID(entityID);
391 if (entity) {400 if (entity) {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t