Merge branch 'Preview4_0_DevHead' into tsneo

This commit is contained in:
Jeff Hutchinson 2021-08-16 22:50:02 -04:00
commit ada1c5a021
521 changed files with 259 additions and 162 deletions

View file

@ -26,7 +26,7 @@
$Tools::resourcePath = "tools/";
// These must be loaded first, in this order, before anything else is loaded
$Tools::loadFirst = "editorClasses base worldEditor";
$Tools::loadFirst = "editorClasses base worldEditor assetBrowser";
//---------------------------------------------------------------------------------------------
// Object that holds the simObject id that the materialEditor uses to interpret its material list