Merge remote-tracking branch 'origin/gi' into large-worlds

# Conflicts: # Source/Engine/Core/Math/Vector3.h
2022-05-21 19:45:13 +02:00
parent f53a5ff536 1a64df9116
commit 785f8915b7
280 changed files with 7660 additions and 2355 deletions
--- a/Source/Engine/Content/Assets/Material.cpp
+++ b/Source/Engine/Content/Assets/Material.cpp
@@ -48,6 +48,11 @@ const MaterialInfo& Material::GetInfo() const
    return EmptyInfo;
 }

+GPUShader* Material::GetShader() const
+{
+    return _materialShader ? _materialShader->GetShader() : nullptr;
+}
+
 bool Material::IsReady() const
 {
    return _materialShader && _materialShader->IsReady();