Showing the changes to libraries/entities/src/EntityScriptingInterface.cpp (1 of 5 files). Show all
Unified · Split
| @@ -816,6 +816,10 @@ QUuid EntityScriptingInterface::editEntity(QUuid id, const EntityItemProperties& · 815 unmodified lines | |||
| 816 | 816 | ||
| 817 | QString previousUserdata; | 817 | QString previousUserdata; |
| 818 | if (entity) { | 818 | if (entity) { |
| 819 | if (properties.hasTransformOrVelocityChanges() && entity->hasGrabs()) { | ||
| 820 | // if an entity is grabbed, the grab will override any position changes | ||
| 821 | properties.clearTransformOrVelocityChanges(); | ||
| 822 | } | ||
| 819 | if (properties.hasSimulationRestrictedChanges()) { | 823 | if (properties.hasSimulationRestrictedChanges()) { |
| 820 | if (_bidOnSimulationOwnership) { | 824 | if (_bidOnSimulationOwnership) { |
| 821 | // flag for simulation ownership, or upgrade existing ownership priority | 825 | // flag for simulation ownership, or upgrade existing ownership priority |