(3a98135bd) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

2019-03-29 17:21:37 +02:00
parent c0cf060526
commit d974a5d72f
11 changed files with 151 additions and 197 deletions
@@ -1656,7 +1656,8 @@ namespace Barotrauma
 #if CLIENT
            if (isLocalPlayer)
            {
-                if (GUI.MouseOn == null && !CharacterInventory.IsMouseOnInventory())
+                if (GUI.MouseOn == null && 
+                    (!CharacterInventory.IsMouseOnInventory() || CharacterInventory.DraggingItemToWorld))
                {
                    if (findFocusedTimer <= 0.0f || Screen.Selected == GameMain.SubEditorScreen)
                    {