TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-24 09:03:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixes path var issue that prevented newly created material assets from loading automatically when created via importing

Browse source 
Fixes issue of camera speed popup having a transparent background.
This commit is contained in:
Areloch 2020-04-05 01:32:44 -05:00
parent 4f1c0769b1
commit 72b489fe25
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/material.cs
View file

@ -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);
}

4
Templates/BaseGame/game/tools/gui/profiles.ed.cs
View file

@ -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");
};