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

Merge branch 'development' into imageAsset_refactor_rev3

Browse source
This commit is contained in:
marauder2k7 2025-03-24 20:07:06 +00:00 • committed by GitHub
commit 0da0903599
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4189 changed files with 29881 additions and 635347 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Templates/BaseGame/game/tools/materialEditor/scripts/materialEditor.ed.tscript
View file

@ -2733,6 +2733,11 @@ function matEdDragNDropMapAssignment(%type, %payload)
MaterialEditorGui.guiSync( materialEd_previewMaterial );
MaterialEditorGui.doUpdateTextureMap( %assetId );
Canvas.popDialog(EditorDragAndDropLayer);
if(EditorSettings.value("AssetManagement/Assets/closeBrowserOnDragAction", false))
{
AssetBrowser.hideDialog();
}
}
function materialEditorDiffuseMapContainer::onControlDropped( %this, %payload, %position )