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

Merge pull request #753 from Areloch/miscFixes20220327

Browse source 
Misc Fixes for 2022/03/27
This commit is contained in:
Brian Roberts 2022-03-27 04:36:49 -05:00 • committed by GitHub
commit c64671ff91
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
27 changed files with 311 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Templates/BaseGame/game/tools/convexEditor/convexEditorGui.tscript
View file

@ -179,7 +179,7 @@ function ConvexEditorMaterialBtn::gotMaterialName(%this, %name)
ConvexEditorOptionsWindow-->matPreviewBtn.setBitmap(getAssetPreviewImage(%diffusemap));
ConvexEditorOptionsWindow.activeMaterial = %materialAsset.materialDefinitionName;
ConvexEditorOptionsWindow.activeMaterial = %materialAsset.getAssetId();
}
function ConvexEditorMaterialApplyBtn::onClick(%this)