Merge branch 'master' into ocio_node

This commit is contained in:
Thomas Wilshaw
2022-05-03 18:54:02 +01:00
218 changed files with 5015 additions and 2165 deletions
+1 -1
View File
@@ -84,7 +84,7 @@ public:
static void Destroy();
static Menu* CreateMenu(QWidget *parent, bool create_none_item = false, Node::CategoryID restrict_to = Node::kCategoryUnknown);
static Menu* CreateMenu(QWidget *parent, bool create_none_item = false, Node::CategoryID restrict_to = Node::kCategoryUnknown, uint64_t restrict_flags = 0);
static Node* CreateFromMenuAction(QAction* action);