Merge branch 'master' into 1.1

# Conflicts: # Source/Engine/Content/JsonAsset.h # Source/Engine/Core/Config/Settings.h
2021-02-15 10:40:59 +01:00
parent bd5897eaab 2357b60d0e
commit 312e4ad010
77 changed files with 1111 additions and 531 deletions
--- a/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.h
+++ b/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.h
@@ -205,6 +205,7 @@ public:
    static MaterialValue getUVs;
    static MaterialValue getTime;
    static MaterialValue getNormal;
+    static MaterialValue getNormalZero;
    static MaterialValue getVertexColor;
    static MaterialGraphBoxesMapping MaterialGraphBoxesMappings[];