Merge branch 'development' into cmake/linux_fix_warn_unused

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-08-26 08:23:02 -07:00
parent e5e271f45a 040b75c02c
commit 906ace3d03
66 changed files with 331 additions and 232 deletions
@@ -156,7 +156,7 @@ public:
    virtual ~CTrackViewNode() {}

    // Name
-    virtual const char* GetName() const = 0;
+    virtual AZStd::string GetName() const = 0;
    virtual bool SetName([[maybe_unused]] const char* pName) { return false; };
    virtual bool CanBeRenamed() const { return false; }