Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 03:44:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #11904 from druiz17/fix-equipping

Browse source 
Fix adjusting equipped entities
This commit is contained in:
Brad Hefta-Gaub 2017-12-02 18:31:00 -08:00 committed by GitHub
commit 218b4635b2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scripts/system/controllers/controllerModules/nearParentGrabEntity.js
View file

@ -81,7 +81,8 @@ Script.include("/~/system/libraries/cloneEntityUtils.js");
};
this.otherHandIsParent = function(props) {
return this.getOtherModule().thisHandIsParent(props);
var otherModule = this.getOtherModule();
return (otherModule.thisHandIsParent(props) && otherModule.grabbing);
};
this.startNearParentingGrabEntity = function (controllerData, targetProps) {