birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'development' into cmake/linux_fix_warn_unused

Browse Source 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Bits.h
#	Gems/Atom/RHI/Code/Include/Atom/RHI/IndexBufferView.h
#	Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.cpp
#	Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindow.cpp
This commit is contained in:
Esteban Papp
2021-08-24 10:43:48 -07:00
parent 91077b0dcd cd9621f16e
commit 9c7b55a31d
175 changed files with 2981 additions and 2167 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Code/Tools/SceneAPI/SceneCore/SceneBuilderDependencyBus.h
+6 -1
View File
@@ -24,7 +24,12 @@ namespace AZ
: public AZ::EBusTraits
{
public:
virtual void ReportJobDependencies(JobDependencyList& jobDependencyList, const char* platformIdentifier) = 0;
//! Builders can implement this function to add job dependencies on other assets that may be used in the scene file conversion process.
virtual void ReportJobDependencies(JobDependencyList& jobDependencyList, const char* platformIdentifier) { AZ_UNUSED(jobDependencyList); AZ_UNUSED(platformIdentifier); }
//! Builders can implement this function to append to the job analysis fingerprint. This can be used to trigger rebuilds when global configuration changes.
//! See also AssetBuilderDesc::m_analysisFingerprint.
virtual void AddFingerprintInfo(AZStd::set<AZStd::string>& fingerprintInfo) { AZ_UNUSED(fingerprintInfo); }
};
using SceneBuilderDependencyBus = EBus<SceneBuilderDependencyRequests>;
} // namespace SceneAPI