Merge branch 'master' into dev

# Conflicts:
#	lua/weapons/gmod_tool/stools/adv_bone.lua
This commit is contained in:
Thirteen 2018-09-15 18:52:58 +01:00
commit 525f5771ae

View File

@ -91,6 +91,7 @@ end
function TOOL:SelectEntity( ent, physbone )
if CLIENT then return true end
if ( IsValid( ent ) ) then
if ( IsValid( ent.AttachedEntity ) ) then ent = ent.AttachedEntity end
self.Entity = ent
self.Bone = self.Entity:TranslatePhysBoneToBone( physbone ) or 0
self:GetOwner():SetNWEntity( "AdvBoneEntity", self.Entity )