Merge branch 'master' into 1.5

2022-11-22 19:58:53 +01:00
parent eeff5ea3ae 2e46ebea7a
commit 2ad6eb0c72
40 changed files with 400 additions and 206 deletions
--- a/Source/Engine/Particles/Graph/GPU/ParticleEmitterGraph.GPU.Textures.cpp
+++ b/Source/Engine/Particles/Graph/GPU/ParticleEmitterGraph.GPU.Textures.cpp
@@ -245,6 +245,9 @@ void ParticleEmitterGPUGenerator::ProcessGroupTextures(Box* box, Node* node, Val
            value = writeLocal(VariantType::Int, String::Format(TEXT("(int)({0}.a * 3.999)"), gBuffer1Sample.Value), node);
            break;
        }
+        case MaterialSceneTextures::WorldPosition:
+            value = Value::Zero; // Not implemented
+            break;
        default:
        {
            // Sample single texture