From 72b489fe252e504910022fefbb4d71226b929420 Mon Sep 17 00:00:00 2001
From: Areloch <Areloch@gmail.com>
Date: Sun, 5 Apr 2020 01:32:44 -0500
Subject: [PATCH] Fixes path var issue that prevented newly created material
 assets from loading automatically when created via importing Fixes issue of
 camera speed popup having a transparent background.

---
 .../game/tools/assetBrowser/scripts/assetTypes/material.cs  | 6 +++---
 Templates/BaseGame/game/tools/gui/profiles.ed.cs            | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/material.cs b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/material.cs
index 18d4432f1..ed74dbc90 100644
--- a/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/material.cs
+++ b/Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/material.cs
@@ -399,8 +399,8 @@ function AssetBrowser::importMaterialAsset(%this, %assetItem)
             else if(%childAssetItem.imageType $= "Composite")
                %mapFieldName = "PBRConfigMap";
             
-            %assetPath = fileName(%childAssetItem.filePath);
-            %file.writeline("   "@ %mapFieldName @ "[0] = \"" @ %assetPath @"\";");
+            %path = fileName(%childAssetItem.filePath);
+            %file.writeline("   "@ %mapFieldName @ "[0] = \"" @ %path @"\";");
             %file.writeline("   "@ %mapFieldName @ "Asset[0] = \"" @ %moduleName @ ":" @ %childAssetItem.assetName @"\";");
          }
       }
@@ -413,7 +413,7 @@ function AssetBrowser::importMaterialAsset(%this, %assetItem)
    %moduleDef = ModuleDatabase.findModule(%moduleName,1);
          
    if(!AssetBrowser.isAssetReImport)
-      AssetDatabase.addDeclaredAsset(%moduleDef, %assetPath @ "/" @ %assetName @ ".asset.taml");
+      AssetDatabase.addDeclaredAsset(%moduleDef, %tamlpath);
    else
       AssetDatabase.refreshAsset(%assetId);
 }
diff --git a/Templates/BaseGame/game/tools/gui/profiles.ed.cs b/Templates/BaseGame/game/tools/gui/profiles.ed.cs
index e02630af6..cd45141bd 100644
--- a/Templates/BaseGame/game/tools/gui/profiles.ed.cs
+++ b/Templates/BaseGame/game/tools/gui/profiles.ed.cs
@@ -1232,8 +1232,10 @@ singleton GuiControlProfile (inspectorStyleRolloutNoHeaderProfile)
 singleton GuiControlProfile (IconDropdownProfile) 
 {
    border = -2;
+   opaque = true;
+   border = true;
    category = "Editor";
    //bitmap = "./icon-dropdownbar";
    
-   fillColor = "0 0 0";
+   fillColor = EditorSettings.value("Theme/headerColor");
 };
\ No newline at end of file