From 2faf44821b5e0bc56a2619a7657c623525d91649 Mon Sep 17 00:00:00 2001
From: parax0 <parax0@github.com>
Date: Wed, 16 Dec 2015 18:20:26 -0700
Subject: [PATCH] Fix for preview scale on billboards, prevent CDoorExtra from
 drawing its wireframe in game mode, change default World Editor tab to Modify

---
 src/Core/Scene/CScriptNode.cpp         | 2 +-
 src/Core/ScriptExtra/CDoorExtra.cpp    | 2 +-
 src/Editor/WorldEditor/CWorldEditor.ui | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Core/Scene/CScriptNode.cpp b/src/Core/Scene/CScriptNode.cpp
index 5c21d26b..1436d6f6 100644
--- a/src/Core/Scene/CScriptNode.cpp
+++ b/src/Core/Scene/CScriptNode.cpp
@@ -488,7 +488,7 @@ CAABox CScriptNode::PreviewVolumeAABox() const
 CVector2f CScriptNode::BillboardScale() const
 {
     CVector2f out = (mpInstance->Template()->ScaleType() == CScriptTemplate::eScaleEnabled ? AbsoluteScale().xz() : CVector2f(1.f));
-    return out * 0.5f;
+    return out * 0.5f * mScaleMultiplier;
 }
 
 // ************ PROTECTED ************
diff --git a/src/Core/ScriptExtra/CDoorExtra.cpp b/src/Core/ScriptExtra/CDoorExtra.cpp
index be0562f0..194bfa86 100644
--- a/src/Core/ScriptExtra/CDoorExtra.cpp
+++ b/src/Core/ScriptExtra/CDoorExtra.cpp
@@ -49,7 +49,7 @@ void CDoorExtra::AddToRenderer(CRenderer *pRenderer, const SViewInfo& ViewInfo)
         else
             pRenderer->AddOpaqueMesh(this, -1, AABox(), eDrawMesh);
 
-        if (mpParent->IsSelected())
+        if (mpParent->IsSelected() && !ViewInfo.GameMode)
             pRenderer->AddOpaqueMesh(this, -1, AABox(), eDrawSelection);
     }
 }
diff --git a/src/Editor/WorldEditor/CWorldEditor.ui b/src/Editor/WorldEditor/CWorldEditor.ui
index bbb94610..3d40d37c 100644
--- a/src/Editor/WorldEditor/CWorldEditor.ui
+++ b/src/Editor/WorldEditor/CWorldEditor.ui
@@ -342,7 +342,7 @@
         <enum>QTabWidget::Rounded</enum>
        </property>
        <property name="currentIndex">
-        <number>4</number>
+        <number>1</number>
        </property>
        <property name="iconSize">
         <size>