Merge branch 'master' into ocio_node

2022-05-03 18:54:02 +01:00
parent 985131af55 d2010760ed
commit e07240cc30
218 changed files with 5015 additions and 2165 deletions
@@ -89,7 +89,7 @@ void NodeFactory::Destroy()
  library_.clear();
 }

-Menu *NodeFactory::CreateMenu(QWidget* parent, bool create_none_item, Node::CategoryID restrict_to)
+Menu *NodeFactory::CreateMenu(QWidget* parent, bool create_none_item, Node::CategoryID restrict_to, uint64_t restrict_flags)
 {
  Menu* menu = new Menu(parent);
  menu->setToolTipsVisible(true);
@@ -102,6 +102,10 @@ Menu *NodeFactory::CreateMenu(QWidget* parent, bool create_none_item, Node::Cate
      continue;
    }

+    if (restrict_flags && !(n->GetFlags() & restrict_flags)) {
+      continue;
+    }
+
    if (hidden_.contains(i)) {
      // Skip this node
      continue;