oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into pr/1875

Browse Source
This commit is contained in:
itsmattkc
2022-05-04 15:04:28 -07:00
parent 2827758fae 102ce9aa7b
commit 81e2628cbb
140 changed files with 791 additions and 585 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/node/keying/colordifferencekey/colordifferencekey.cpp
-5
View File
@@ -49,11 +49,6 @@ ColorDifferenceKeyNode::ColorDifferenceKeyNode()
SetEffectInput(kTextureInput);
}
Node *ColorDifferenceKeyNode::copy() const
{
return new ColorDifferenceKeyNode();
}
QString ColorDifferenceKeyNode::Name() const
{
return tr("Color Difference Key");
app/node/keying/colordifferencekey/colordifferencekey.h
+1 -1
View File
@@ -24,7 +24,7 @@ class ColorDifferenceKeyNode : public Node {
public:
ColorDifferenceKeyNode();
virtual Node* copy() const override;
NODE_DEFAULT_FUNCTIONS(ColorDifferenceKeyNode)
virtual QString Name() const override;
virtual QString id() const override;
app/node/keying/despill/despill.cpp
-5
View File
@@ -40,11 +40,6 @@ DespillNode::DespillNode()
SetEffectInput(kTextureInput);
}
Node* DespillNode::copy() const
{
return new DespillNode();
}
QString DespillNode::Name() const
{
return tr("Despill");
app/node/keying/despill/despill.h
+4 -4
View File
@@ -25,7 +25,7 @@ class DespillNode : public Node {
public:
DespillNode();
virtual Node* copy() const override;
NODE_DEFAULT_FUNCTIONS(DespillNode)
virtual QString Name() const override;
virtual QString id() const override;
@@ -36,13 +36,13 @@ class DespillNode : public Node {
virtual ShaderCode GetShaderCode(const QString& shader_id) const override;
virtual void Value(const NodeValueRow& value, const NodeGlobals& globals, NodeValueTable* table) const override;
static const QString kTextureInput;
static const QString kColorInput;
static const QString kMethodInput;
static const QString kPreserveLuminanceInput;
};
} // namespace olive