Requested cleanups

This commit is contained in:
Areloch 2021-09-01 17:57:21 -05:00
parent 25a32cba2a
commit e8a49ef4ca
5 changed files with 16 additions and 14 deletions

View file

@ -32,7 +32,6 @@ function AssetBrowser_addModuleWindow::onGainFirstResponder(%this)
function AssetBrowser_addModuleWindow::close()
{
Canvas.popDialog(AssetBrowser_addModule);
//eval(AssetBrowser_addModuleWindow.callbackFunction);
}
function AssetBrowser_addModuleWindow::CreateNewModule(%this)

View file

@ -198,20 +198,20 @@ function AssetBrowser::buildImageAssetPreview(%this, %assetDef, %previewData)
if(%success)
{
%previewAsset = new ImageAsset()
{
assetName = %previewAssetName;
versionId = 1;
imageFile = fileName(%previewFilePath);
};
%previewAsset = new ImageAsset()
{
assetName = %previewAssetName;
versionId = 1;
imageFile = fileName(%previewFilePath);
};
%previewAssetName = "ToolsModule:" @ %previewAssetName;
%previewImgAssetPath = %previewPath @ %previewAsset.assetName @ ".asset.taml";
%assetImportSuccessful = TAMLWrite(%previewAsset, %previewImgAssetPath);
%previewImgAssetPath = %previewPath @ %previewAsset.assetName @ ".asset.taml";
%assetImportSuccessful = TAMLWrite(%previewAsset, %previewImgAssetPath);
%toolsModuleDef = ModuleDatabase.findModule("ToolsModule",1);
%toolsModuleDef = ModuleDatabase.findModule("ToolsModule",1);
%success = AssetDatabase.addDeclaredAsset(%toolsModuleDef, %previewImgAssetPath);
%success = AssetDatabase.addDeclaredAsset(%toolsModuleDef, %previewImgAssetPath);
}
else
{

View file

@ -324,9 +324,13 @@ function AssetBrowser::buildShapeAssetPreview(%this, %assetDef, %previewData)
else
{
if(EditorSettings.value("Assets/Browser/doubleClickAction", "Edit Asset") $= "Edit Asset")
%previewData.doubleClickCommand = "AssetBrowser.editAsset( "@%assetDef@" );";
{
%previewData.doubleClickCommand = "AssetBrowser.editAsset( "@%assetDef@" );";
}
else
{
%previewData.doubleClickCommand = "AssetBrowser.onShapeAssetEditorDropped( "@%assetDef@" );";
}
}
}

View file

@ -364,7 +364,6 @@ new GuiControlProfile( ToolsGuiButtonProfile )
fixedExtent = false;
justify = "center";
canKeyFocus = false;
//bitmapAsset = "ToolsModule:button_image";
hasBitmapArray = false;
category = "Tools";
};

View file

@ -1059,7 +1059,7 @@ function EditorDropTypeMenu::onSelectItem(%this, %id, %text)
// a drop type is selected in the menu.
EWorldEditor.dropType = getField(%this.item[%id], 2);
for(%i=0; %i < %this.getItemCount() + 1; %i++)
for(%i=0; %i < %this.getItemCount(); %i++)
{
%this.checkItem(%i, false);
}