Quellcode durchsuchen

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.

Areloch vor 5 Jahren
Ursprung
Commit
72b489fe25

+ 3 - 3
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);
 }

+ 3 - 1
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");
 };