Merge branch 'v2.15-LTS'

# Conflicts: # .github/workflows/draft-release.yml # Code/CMakeLists.txt # Code/Platform/Linux/PAL_linux.cmake # Code/Platform/Mac/PAL_mac.cmake # Code/Platform/Windows/PAL_windows.cmake # README.md # gem.json
PopcornFX · Sep 27, 2023 · e511ccd · e511ccd
2 parents bc2bd7a + 49a3b48
commit e511ccd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/Code/Source/Integration/Editor/BakerManager.cpp b/Code/Source/Integration/Editor/BakerManager.cpp
@@ -218,7 +218,9 @@ AZStd::string	CBakerManager::BakeSingleAsset(const AZStd::string &assetPath, con
 	CLog::Log(PK_INFO, "Baking effect '%s'", virtualPath.Data());
 
 	const bool	bakeOk = m_Cookery->BakeAsset(virtualPath, m_Cookery->m_BaseConfigFile, bakerMessages, dstPackPaths);
+#if (PK_MESSAGE_STREAM_NO_MESSAGES == 0)
 	LogBakerMessages(bakerMessages);
+#endif
 	if (!bakeOk)
 	{
 		CLog::Log(PK_ERROR, "Failed baking effect '%s'", virtualPath.Data());
@@ -294,6 +296,7 @@ bool	CBakerManager::GatherDependencies(const AZStd::string &assetPath, AZStd::ve
 	return true;
 }
 
+#if (PK_MESSAGE_STREAM_NO_MESSAGES == 0)
 void	CBakerManager::LogBakerMessages(const CMessageStream &messages)
 {
 	PopcornFX::TArray<CString>	messageLines;
@@ -319,6 +322,7 @@ void	CBakerManager::LogBakerMessages(const CMessageStream &messages)
 		}
 	}
 }
+#endif // (PK_MESSAGE_STREAM_NO_MESSAGES == 0)
 
 bool	CBakerManager::_SetPackIFN(const AZStd::string &assetPath, CWindManager &windManager)
 {

diff --git a/Code/Source/Integration/Editor/BakerManager.h b/Code/Source/Integration/Editor/BakerManager.h
@@ -59,7 +59,9 @@ class CBakerManager
 		bool	Initialize();
 	};
 
+#if (PK_MESSAGE_STREAM_NO_MESSAGES == 0)
 	void	LogBakerMessages(const CMessageStream &messages);
+#endif
 	bool	_SetPackIFN(const AZStd::string &assetPath, CWindManager &windManager);
 	void	_SetBuildVersion(const AZStd::string &platform);