mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-04-23 21:35:34 +00:00
Merge pull request #1454 from marauder2k9-torque/FixCompile-imageAsset
Fix after merge of image_asset
This commit is contained in:
commit
c0d87cd3f1
4 changed files with 13 additions and 17 deletions
|
|
@ -4,8 +4,8 @@ function ImageAsset::buildBrowserElement(%this, %previewData)
|
|||
{
|
||||
//%module = %this.dirHandler.getModuleFromAddress(makeRelativePath(filePath(%assetDef.getImagePath())));
|
||||
|
||||
%previewData.previewImage = %assetDef.isNamedTarget() ? "Core_Rendering:namedTarget_image" : "ToolsModule:genericAssetIcon_image";
|
||||
%previewData.previewLoaded = %assetDef.isNamedTarget() ? true : false; //if image target we are loaded, else mark for loading later.
|
||||
%previewData.previewImage = %this.isNamedTarget() ? "Core_Rendering:namedTarget_image" : "ToolsModule:genericAssetIcon_image";
|
||||
%previewData.previewLoaded = %this.isNamedTarget() ? true : false;//this marks it for loading progressively later
|
||||
|
||||
%previewData.assetName = %this.assetName;
|
||||
%previewData.assetPath = %this.scriptFile;
|
||||
|
|
@ -61,11 +61,11 @@ function ImageAsset::generatePreviewImage(%this, %previewButton, %forceRegenerat
|
|||
versionId = 1;
|
||||
imageFile = makeFullPath(%previewFilePath);
|
||||
};
|
||||
|
||||
|
||||
%previewAssetName = "ToolsModule:" @ %previewAssetName;
|
||||
%previewImgAssetPath = %previewPath @ %previewAsset.assetName @ ".asset.taml";
|
||||
|
||||
%assetImportSuccessful = TAMLWrite(%previewAsset, %previewImgAssetPath);
|
||||
|
||||
%toolsModuleDef = ModuleDatabase.findModule("ToolsModule",1);
|
||||
|
||||
%success = AssetDatabase.addDeclaredAsset(%toolsModuleDef, %previewImgAssetPath);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue