From 748c58d52ed66fbb7c572b0ba9dbd68f189a7895 Mon Sep 17 00:00:00 2001 From: PrecisionRender Date: Mon, 24 Oct 2022 19:36:16 -0500 Subject: [PATCH] Initial commit --- Source/Editor/Surface/Archetypes/Textures.cs | 2 +- .../Tools/MaterialGenerator/MaterialGenerator.Textures.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Editor/Surface/Archetypes/Textures.cs b/Source/Editor/Surface/Archetypes/Textures.cs index 2b566b0bd..6e4e34f43 100644 --- a/Source/Editor/Surface/Archetypes/Textures.cs +++ b/Source/Editor/Surface/Archetypes/Textures.cs @@ -400,7 +400,7 @@ namespace FlaxEditor.Surface.Archetypes Elements = new[] { NodeElementArchetype.Factory.Input(0, "Texture", true, typeof(FlaxEngine.Object), 0), - NodeElementArchetype.Factory.Input(1, "Scale", true, typeof(float), 1, 0), + NodeElementArchetype.Factory.Input(1, "Scale", true, typeof(Float3), 1, 0), NodeElementArchetype.Factory.Input(2, "Blend", true, typeof(float), 2, 1), NodeElementArchetype.Factory.Output(0, "Color", typeof(Float3), 3) } diff --git a/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Textures.cpp b/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Textures.cpp index a29b3d0d9..0c71dc1ba 100644 --- a/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Textures.cpp +++ b/Source/Engine/Tools/MaterialGenerator/MaterialGenerator.Textures.cpp @@ -467,7 +467,7 @@ void MaterialGenerator::ProcessGroupTextures(Box* box, Node* node, Value& value) } const auto texture = eatBox(textureBox->GetParent(), textureBox->FirstConnection()); - const auto scale = tryGetValue(scaleBox, node->Values[0]).AsFloat(); + const auto scale = tryGetValue(scaleBox, node->Values[0]).AsFloat3(); const auto blend = tryGetValue(blendBox, node->Values[1]).AsFloat(); auto result = writeLocal(Value::InitForZero(ValueType::Float4), node);