Added changes missed via merge failures.

Removed some unused files/references that were causing errors, related to issues #502 & #512
This commit is contained in:
Areloch 2021-07-20 20:05:49 -05:00
parent 5525f8ecdd
commit 3e131f5b8e
78 changed files with 1812 additions and 1832 deletions

View file

@ -114,6 +114,21 @@ function T3Dpre4ProjectImporter::copyFiles(%this)
%file = findNextFileMultiExpr( $ProjectImporter::sourceContentFolder @ "/*.*" );
}
//
//Now that we've done that, we'll load and scan the module for asset defs
%file = findFirstFileMultiExpr( $ProjectImporter::modulePath @ "/*.asset.taml", true);
while( %file !$= "" )
{
%moduleName = AssetBrowser.dirHandler.getModuleFromAddress(%file).ModuleId;
%moduleDef = ModuleDatabase.findModule(%moduleName, 1);
AssetDatabase.addDeclaredAsset(%moduleDef, %file);
%file = findNextFileMultiExpr( $ProjectImporter::modulePath @ "/*.asset.taml" );
}
//
%currentPage-->fileCopyText.setValue("File copy done! Press Next to continue.");
ProjectImportWindow-->nextButton.setActive(true);