Integrating up through commit 90f050496

2021-04-07 14:03:29 -07:00
parent 8f2ed080a9
commit c2cbd430fe
2694 changed files with 285622 additions and 176874 deletions
@@ -878,13 +878,16 @@ namespace GraphCanvas

            if (dataRequests)
            {
-                if (dataRequests->GetDataSlotType() == DataSlotType::Value && dataRequests->CanConvertToReference())
+                if (!dataRequests->IsUserSlot())
                {
-                    dataRequests->ConvertToReference();
-                }
-                else if (dataRequests->GetDataSlotType() == DataSlotType::Reference && dataRequests->CanConvertToValue())
-                {
-                    dataRequests->ConvertToValue();
+                    if (dataRequests->GetDataSlotType() == DataSlotType::Value && dataRequests->CanConvertToReference())
+                    {
+                        dataRequests->ConvertToReference();
+                    }
+                    else if (dataRequests->GetDataSlotType() == DataSlotType::Reference && dataRequests->CanConvertToValue())
+                    {
+                        dataRequests->ConvertToValue();
+                    }
                }
            }
        }