TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-14 16:14:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #790 from Areloch/MiscFixes20220524

Browse source 
Misc Fixes for 2022/05/24
This commit is contained in:
Brian Roberts 2022-05-25 00:25:37 -05:00 • committed by GitHub
commit dd801ec1a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Engine/source/T3D/assets/ImageAsset.cpp
View file

@ -221,8 +221,7 @@ StringTableEntry ImageAsset::getAssetIdByFilename(StringTableEntry fileName)
} }
else else
{ {
AssetPtr<ImageAsset> imageAsset = imageAssetId; AssetPtr<ImageAsset> imageAsset = imageAssetId; //ensures the fallback is loaded
imageAsset->mLoadedState = AssetErrCode::BadFileReference;
} }
return imageAssetId; return imageAssetId;

3
Engine/source/T3D/assets/ShapeAsset.cpp
View file

@ -475,8 +475,7 @@ StringTableEntry ShapeAsset::getAssetIdByFilename(StringTableEntry fileName)
} }
else else
{ {
AssetPtr<ShapeAsset> shapeAsset = shapeAssetId; AssetPtr<ShapeAsset> shapeAsset = shapeAssetId; //ensures the fallback is loaded
shapeAsset->mLoadedState = AssetErrCode::BadFileReference;
} }
return shapeAssetId; return shapeAssetId;

4
Engine/source/T3D/tsStatic.cpp
View file

@ -419,6 +419,8 @@ bool TSStatic::_createShape()
// Reapply the current skin // Reapply the current skin
mAppliedSkinName = ""; mAppliedSkinName = "";
reSkin(); reSkin();
updateMaterials();
} }
prepCollision(); prepCollision();
@ -1619,8 +1621,6 @@ void TSStatic::updateMaterials()
} }
} }
mChangingMaterials.clear();
// Initialize the material instances // Initialize the material instances
mShapeInstance->initMaterialList(); mShapeInstance->initMaterialList();
} }

5
Templates/BaseGame/game/tools/assetBrowser/scripts/looseFileAudit.tscript
View file

@ -128,8 +128,8 @@ function LooseFileAuditWindow::refresh(%this)
while( %file !$= "" ) while( %file !$= "" )
{ {
//%filename = fileName(%file); if(!endsWith(%file, ".cached.dts"))
//%filePath = filePath(%file); {
if(!strIsMatchExpr("*.asset.taml", %file) && !strIsMatchExpr("*.taml", %file)) if(!strIsMatchExpr("*.asset.taml", %file) && !strIsMatchExpr("*.taml", %file))
{ {
%assetsFound = AssetDatabase.findAssetLooseFile(%aq, %file); %assetsFound = AssetDatabase.findAssetLooseFile(%aq, %file);
@ -137,6 +137,7 @@ function LooseFileAuditWindow::refresh(%this)
if(%assetsFound == 0) if(%assetsFound == 0)
{ {
LooseFileList.insertItem(1, %file); LooseFileList.insertItem(1, %file);
}
} }
} }

8
Templates/BaseGame/game/tools/assetBrowser/scripts/popupMenus.tscript
View file

@ -216,7 +216,7 @@ function AssetBrowser::buildPopupMenus(%this)
Item[ 9 ] = "-"; Item[ 9 ] = "-";
Item[ 10 ] = "Delete Module" TAB "" TAB "AssetBrowser.deleteModule();"; Item[ 10 ] = "Delete Module" TAB "" TAB "AssetBrowser.deleteModule();";
item[ 11 ] = "-"; item[ 11 ] = "-";
item[ 12 ] = "Import Loose Files" TAB "" TAB "AssetBrowser.importLooseFiles();"; item[ 12 ] = "View Loose Files" TAB "" TAB "AssetBrowser.importLooseFiles();";
}; };
} }
@ -254,7 +254,7 @@ function AssetBrowser::buildPopupMenus(%this)
item[ 4 ] = "-"; item[ 4 ] = "-";
item[ 5 ] = "Delete Folder" TAB "" TAB "AssetBrowser.deleteAsset();"; item[ 5 ] = "Delete Folder" TAB "" TAB "AssetBrowser.deleteAsset();";
item[ 6 ] = "-"; item[ 6 ] = "-";
item[ 7 ] = "Import Loose Files" TAB "" TAB "AssetBrowser.importLooseFiles();"; item[ 7 ] = "View Loose Files" TAB "" TAB "AssetBrowser.importLooseFiles();";
}; };
} }
@ -326,9 +326,7 @@ function AssetBrowser::buildPopupMenus(%this)
superClass = "MenuBuilder"; superClass = "MenuBuilder";
class = "EditorWorldMenu"; class = "EditorWorldMenu";
item[ 0 ] = "Import Project Loose Files" TAB "" TAB "AssetBrowser.importLooseFiles();"; item[ 1 ] = "Import new assets" TAB "" TAB "Canvas.pushDialog(AssetImportCtrl);";
Item[ 1 ] = "-";
item[ 2 ] = "Import new assets" TAB "" TAB "Canvas.pushDialog(AssetImportCtrl);";
}; };
} }