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
@@ -3446,7 +3446,7 @@ void CTrackViewDopeSheetBase::DrawNodeTrack(CTrackViewAnimNode* animNode, QPaint

    const QRect textRect = trackRect.adjusted(4, 0, -4, 0);

-    QString sAnimNodeName = animNode->GetName();
+    QString sAnimNodeName = QString::fromUtf8(animNode->GetName().c_str());
    const bool hasObsoleteTrack = animNode->HasObsoleteTrack();

    if (hasObsoleteTrack)