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/Content/Assets/MaterialBase.h
+++ b/Source/Engine/Content/Assets/MaterialBase.h
@@ -27,7 +27,6 @@ public:
    /// <summary>
    /// Returns true if material is an material instance.
    /// </summary>
-    /// <returns>True if it's a material instance, otherwise false.</returns>
    virtual bool IsMaterialInstance() const = 0;

 public: