Преглед изворни кода

Merge pull request #2318 from Areloch/AssetModuleEchoTweak

Tweaks to the Asset/Module info echo behavior to spam the console less.
Areloch пре 6 година
родитељ
комит
40627afde8
2 измењених фајлова са 4 додато и 4 уклоњено
  1. 3 3
      Engine/source/assets/assetManager.cpp
  2. 1 1
      Engine/source/module/moduleManager.cpp

+ 3 - 3
Engine/source/assets/assetManager.cpp

@@ -130,8 +130,8 @@ void AssetManager::initPersistFields()
     // Call parent.
     Parent::initPersistFields();
 
-    addField( "EchoInfo", TypeBool, Offset(mEchoInfo, AssetManager), "Whether the asset manager echos extra information to the console or not." );
-    addField( "IgnoreAutoUnload", TypeBool, Offset(mIgnoreAutoUnload, AssetManager), "Whether the asset manager should ignore unloading of auto-unload assets or not." );
+    addField( "EchoInfo", TypeBool, false, Offset(mEchoInfo, AssetManager), "Whether the asset manager echos extra information to the console or not." );
+    addField( "IgnoreAutoUnload", TypeBool, true, Offset(mIgnoreAutoUnload, AssetManager), "Whether the asset manager should ignore unloading of auto-unload assets or not." );
 }
 
 //-----------------------------------------------------------------------------
@@ -228,7 +228,7 @@ bool AssetManager::loadModuleAutoLoadAssets(ModuleDefinition* pModuleDefinition)
    AssertFatal(pModuleDefinition != NULL, "Cannot auto load assets using a NULL module definition");
 
    // Does the module have any assets associated with it?
-   if (pModuleDefinition->getModuleAssets().empty())
+   if (pModuleDefinition->getModuleAssets().empty() && mEchoInfo)
    {
       // Yes, so warn.
       Con::warnf("Asset Manager: Cannot auto load assets to module '%s' as it has no existing assets.", pModuleDefinition->getSignature());

+ 1 - 1
Engine/source/module/moduleManager.cpp

@@ -69,7 +69,7 @@ S32 QSORT_CALLBACK moduleDefinitionVersionIdSort( const void* a, const void* b )
 
 ModuleManager::ModuleManager() :
     mEnforceDependencies(true),
-    mEchoInfo(true),
+    mEchoInfo(false),
     mDatabaseLocks( 0 ),
     mIgnoreLoadedGroups(false)
 {