mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-13 23:54:35 +00:00
Merge pull request #1373 from Azaezel/alpha41/matEDmangle
fix material editor becoming nonresponsive when specifically dragging…
This commit is contained in:
commit
cb63b382ff
1 changed files with 5 additions and 0 deletions
|
|
@ -2733,6 +2733,11 @@ function matEdDragNDropMapAssignment(%type, %payload)
|
||||||
MaterialEditorGui.guiSync( materialEd_previewMaterial );
|
MaterialEditorGui.guiSync( materialEd_previewMaterial );
|
||||||
|
|
||||||
MaterialEditorGui.doUpdateTextureMap( %assetId );
|
MaterialEditorGui.doUpdateTextureMap( %assetId );
|
||||||
|
Canvas.popDialog(EditorDragAndDropLayer);
|
||||||
|
if(EditorSettings.value("AssetManagement/Assets/closeBrowserOnDragAction", false))
|
||||||
|
{
|
||||||
|
AssetBrowser.hideDialog();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function materialEditorDiffuseMapContainer::onControlDropped( %this, %payload, %position )
|
function materialEditorDiffuseMapContainer::onControlDropped( %this, %payload, %position )
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue