History

set up EntityItemPropertiesFromScript to either ignore or honor read-only properties

Seth Alves committed 11 years ago

Commit a96520c1 parent 6913c626 files · +31 −14Browse files

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

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+1−1
@@ -360,7 +360,7 @@ void RayToEntityIntersectionResultFromScriptValue(const QScriptValue& object, Ra · 359 unmodified lines
360 quuidFromScriptValue(entityIDValue, value.entityID);360 quuidFromScriptValue(entityIDValue, value.entityID);
361 QScriptValue entityPropertiesValue = object.property("properties");361 QScriptValue entityPropertiesValue = object.property("properties");
362 if (entityPropertiesValue.isValid()) {362 if (entityPropertiesValue.isValid()) {
363 EntityItemPropertiesFromScriptValue(entityPropertiesValue, value.properties);363 EntityItemPropertiesFromScriptValueHonorReadOnly(entityPropertiesValue, value.properties);
364 }364 }
365 value.distance = object.property("distance").toVariant().toFloat();365 value.distance = object.property("distance").toVariant().toFloat();
366 366

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