Merge remote-tracking branch 'origin/master' into 1.7

2023-07-18 11:47:39 +02:00
parent 07ef07e979 60c0995bc3
commit e39a56fc4e
19 changed files with 340 additions and 47 deletions
--- a/Source/Engine/Graphics/GPUDevice.h
+++ b/Source/Engine/Graphics/GPUDevice.h
@@ -238,7 +238,7 @@ public:
    /// <summary>
    /// Gets the default material.
    /// </summary>
-    MaterialBase* GetDefaultMaterial() const;
+    API_PROPERTY() MaterialBase* GetDefaultMaterial() const;

    /// <summary>
    /// Gets the default material (Deformable domain).