(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
@@ -248,7 +248,7 @@ namespace Barotrauma
                            scale: scale);
                    }

-                    if (!GUI.DisableItemHighlights)
+                    if (!GUI.DisableItemHighlights && !Inventory.DraggingItemToWorld)
                    {
                        var hudTexts = focusedItem.GetHUDTexts(character);