Some fixes

Author: Crisspl

include/nbl/asset/IAssetManager.h

@@ -574,7 +574,6 @@ class IAssetManager : public core::IReferenceCounted, public core::QuitSignallin
         //! @returns 0xdeadbeefu on failure or 0-based index on success.
         uint32_t addAssetLoader(core::smart_refctd_ptr<IAssetLoader>&& _loader)
         {
-            _loader->initialize();
             // there's no way it ever fails, so no 0xdeadbeef return
             const char** exts = _loader->getAssociatedFileExtensions();
             size_t extIx = 0u;

include/nbl/asset/interchange/IAssetLoader.h

@@ -311,9 +311,9 @@ class IAssetLoader : public virtual core::IReferenceCounted
 
 		assert(bundle.getContents().size() == reloadedBundle.getContents().size());
 
-		const uint32_t count = bundle.getContents().size();
-		auto* dummies = bundle.getContents().begin();
-		auto* reloaded = reloadedBundle.getContents().begin();
+		const uint32_t count = bundle.getMutableContents().size();
+		auto* dummies = bundle.getMutableContents().begin();
+		auto* reloaded = reloadedBundle.getMutableContents().begin();
 		for (uint32_t i = 0u; i < count; ++i)
 			if (dummies[i]->isADummyObjectForCache() && !dummies[i]->canBeRestoredFrom(reloaded[i].get()))
 				return {}; // return empty bundle

include/nbl/asset/interchange/SAssetBundle.h

@@ -61,10 +61,6 @@ class SAssetBundle
 		{
 			return core::SRange<const core::smart_refctd_ptr<IAsset>>(m_contents->begin(),m_contents->end());
 		}
-		inline core::SRange<core::smart_refctd_ptr<IAsset>> getContents()
-		{
-			return core::SRange<core::smart_refctd_ptr<IAsset>>(m_contents->begin(), m_contents->end());
-		}
 
 		//! Whether this asset bundle is in a cache and should be removed from cache to destroy
 		inline bool isInAResourceCache() const { return m_isCached; }
@@ -113,6 +109,10 @@ class SAssetBundle
 			m_contents->operator[](offset) = std::move(_asset);
 			assert(allSameTypeAndNotNull());
 		}
+		inline core::SRange<core::smart_refctd_ptr<IAsset>> getMutableContents()
+		{
+			return core::SRange<core::smart_refctd_ptr<IAsset>>(m_contents->begin(), m_contents->end());
+		}
 
 
 		core::smart_refctd_ptr<IAssetMetadata> m_metadata;

src/nbl/asset/IAssetManager.cpp

@@ -185,6 +185,9 @@ void IAssetManager::addLoadersAndWriters()
 #ifdef _NBL_COMPILE_WITH_GLI_WRITER_
 	addAssetWriter(core::make_smart_refctd_ptr<asset::CGLIWriter>());
 #endif
+
+    for (auto& loader : m_loaders.vector)
+        loader->initialize();
 }