Merge remote-tracking branch 'origin/development' into sc-editor-asset-redux

Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
2021-12-02 14:17:35 -08:00
parent 1005ec9700 0498e4a9c3
commit 6bd0308339
3323 changed files with 90625 additions and 60443 deletions
@@ -1111,9 +1111,11 @@ namespace ScriptCanvasEditor
        return CanCreateConnectionBetween(scSourceEndpoint, scTargetEndpoint).IsSuccess();
    }

-    AZStd::string Graph::GetDataTypeString(const AZ::Uuid& typeId)
+    AZStd::string Graph::GetDataTypeString(const AZ::Uuid&)
    {
-        return TranslationHelper::GetSafeTypeName(ScriptCanvas::Data::FromAZType(typeId));
+        // This is used by the default tooltip setting in GraphCanvas, returning an empty string
+        // in order for tooltips to be fully controlled by ScriptCanvas
+        return {};
    }

    void Graph::OnRemoveUnusedNodes()