Merge branch 'master' into otio

2020-10-22 20:26:16 +11:00
parent 0ec262125c 384650e85a
commit 917738d1de
149 changed files with 4350 additions and 2079 deletions
@@ -467,6 +467,11 @@ bool Node::IsTrack() const
  return false;
 }

+bool Node::IsMedia() const
+{
+    return false;
+}
+
 const QList<NodeParam *>& Node::parameters() const
 {
  return params_;