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 pull request #255 from Areloch/DragAndDropImportFix

Browse source 
Fixes issue with Drag-and-drop asset import action
This commit is contained in:
Brian Roberts 2020-07-20 07:58:02 -05:00 • committed by GitHub
commit bc8734b27b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

31
Templates/BaseGame/game/tools/assetBrowser/scripts/assetImport.cs
View file

@ -82,6 +82,9 @@ function ImportAssetWindow::onWake(%this)
AssetImportTargetModule.text = AssetBrowser.dirHandler.getModuleFromAddress(AssetBrowser.dirHandler.currentAddress).ModuleId; AssetImportTargetModule.text = AssetBrowser.dirHandler.getModuleFromAddress(AssetBrowser.dirHandler.currentAddress).ModuleId;
ImportAssetConfigList.setSelected(0); ImportAssetConfigList.setSelected(0);
%this.importer.targetPath = AssetImportTargetAddress.getText();
%this.importer.targetModuleId = AssetImportTargetModule.getText();
ImportActivityLog.empty(); ImportActivityLog.empty();
%this.refresh(); %this.refresh();
@ -707,6 +710,8 @@ function ImportAssetWindow::doRefresh(%this)
} }
%this.dirty = false; %this.dirty = false;
AssetBrowser.refresh();
} }
function ImportAssetWindow::refreshAssetItem(%this, %assetItem, %parentTreeIdx) function ImportAssetWindow::refreshAssetItem(%this, %assetItem, %parentTreeIdx)
@ -965,20 +970,24 @@ function ImportAssetWindow::addMaterialMap(%this, %map)
function ImportAssetWindow::ImportAssets(%this) function ImportAssetWindow::ImportAssets(%this)
{ {
//get the selected module data //get the selected module data
%moduleName = AssetImportTargetModule.getText(); if(%this.importer.targetModuleId $= "")
%module = ModuleDatabase.findModule(%moduleName, 1);
if(!isObject(%module))
{ {
MessageBoxOK( "Error!", "No module selected. You must select or create a module for the assets to be added to."); %moduleName = AssetImportTargetModule.getText();
return;
%module = ModuleDatabase.findModule(%moduleName, 1);
if(!isObject(%module))
{
MessageBoxOK( "Error!", "No module selected. You must select or create a module for the assets to be added to.");
return;
}
Canvas.pushDialog( EditorLoadingGui );
Canvas.repaint();
%this.importer.targetModuleId = %moduleName;
} }
Canvas.pushDialog( EditorLoadingGui );
Canvas.repaint();
%this.importer.targetModuleId = %moduleName;
%this.importer.targetPath = AssetImportTargetAddress.getText(); %this.importer.targetPath = AssetImportTargetAddress.getText();
%this.importer.importAssets(); %this.importer.importAssets();