Merge to Dev-Main for 4.20 @ 4090813

#rb
#rnx
#lockdown Nick.Penwarden

[CL 4091081 by Marc Audy in Main branch]
This commit is contained in:
Marc Audy
2018-05-23 21:04:31 -04:00
parent d25270fdea
commit d90da4ab1a
2547 changed files with 100433 additions and 102532 deletions
@@ -43,6 +43,8 @@ class UK2Node_SetFieldsInStruct : public UK2Node_MakeStruct
BLUEPRINTGRAPH_API void RestoreAllPins();
protected:
void BackTracePinPath(UEdGraphPin* OutputPin, TFunctionRef<void(UEdGraphPin*)> Predicate) const;
struct FSetFieldsInStructPinManager : public FMakeStructPinManager
{
public:
@@ -56,4 +58,6 @@ private:
/** Constructing FText strings can be costly, so we cache the node's title/tooltip */
FNodeTextCache CachedTooltip;
FNodeTextCache CachedNodeTitle;
mutable bool bRecursionGuard;
};