Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 18:13:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'fix-parent-grab' of github.com:sethalves/hifi into fix-parent-grab

Browse source
This commit is contained in:
Seth Alves 2017-09-26 11:08:40 -07:00
commit 216888aa03
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
scripts/system/controllers/controllerModules/equipEntity.js
View file

@ -499,6 +499,7 @@ EquipHotspotBuddy.prototype.update = function(deltaTime, timestamp, controllerDa
var cloneID = this.cloneHotspot(grabbedProperties, controllerData); var cloneID = this.cloneHotspot(grabbedProperties, controllerData);
this.targetEntityID = cloneID; this.targetEntityID = cloneID;
Entities.editEntity(this.targetEntityID, reparentProps); Entities.editEntity(this.targetEntityID, reparentProps);
controllerData.nearbyEntityPropertiesByID[this.targetEntityID] = grabbedProperties;
isClone = true; isClone = true;
} else if (!grabbedProperties.locked) { } else if (!grabbedProperties.locked) {
Entities.editEntity(this.targetEntityID, reparentProps); Entities.editEntity(this.targetEntityID, reparentProps);