GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Wojciech Figat
2022-04-11 10:37:23 +02:00
parent bd48829a09 1eac02d173
commit db0cb04b83
59 changed files with 471 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Engine/Visject/VisjectGraph.cpp
View File

@@ -154,8 +154,13 @@ void VisjectExecutor::ProcessGroupMath(Box* box, Node* node, Value& value)
case 40:
case 41:
{
Value v1 = tryGetValue(node->GetBox(0), 0, Value::Zero);
Value v2 = tryGetValue(node->GetBox(1), 1, Value::Zero).Cast(v1.Type);
auto b1 = node->GetBox(0);
Value v1 = tryGetValue(b1, 0, Value::Zero);
Value v2 = tryGetValue(node->GetBox(1), 1, Value::Zero);
if (b1->HasConnection())
v2 = v2.Cast(v1.Type);
else
v1 = v1.Cast(v2.Type);
GraphUtilities::ApplySomeMathHere(node->TypeID, value, v1, v2);
break;
}