Merge branch 'master' into pr/1875

2022-05-04 15:04:28 -07:00
parent 2827758fae 102ce9aa7b
commit 81e2628cbb
140 changed files with 791 additions and 585 deletions
@@ -38,6 +38,8 @@ class ColorManager : public Node
 public:
  ColorManager();

+  NODE_DEFAULT_FUNCTIONS(ColorManager)
+
  virtual QString Name() const override
  {
    return tr("Color Manager");
@@ -58,11 +60,6 @@ public:
    return tr("Color management configuration for project.");
  }

-  virtual Node* copy() const override
-  {
-    return new ColorManager();
-  }
-
  OCIO::ConstConfigRcPtr GetConfig() const;

  static OCIO::ConstConfigRcPtr CreateConfigFromFile(const QString& filename);