Merge branch 'master' into gizmos

2020-05-06 16:35:40 +10:00
parent 2e0082b04c 78e305a593
commit 1ceefb6dba
86 changed files with 1276 additions and 1589 deletions
@@ -69,9 +69,9 @@ QString MatrixGenerator::id() const
  return QStringLiteral("org.olivevideoeditor.Olive.transform");
 }

-QString MatrixGenerator::Category() const
+QList<Node::CategoryID> MatrixGenerator::Category() const
 {
-  return tr("Generator");
+  return {kCategoryGenerator, kCategoryMath};
 }

 QString MatrixGenerator::Description() const