Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEitanSomething <eitant13@gmail.com>2019-08-23 14:13:59 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-08-23 14:14:15 +0300
commit8eb22968724b3ac9f6ccb426b08cb865cbbcef94 (patch)
tree7d74d378aef4bb98fdb651f43c8a3aef072c85c7 /source/blender/compositor/operations
parent2f8ea1c11e1065984013b02f7dea3051705411ea (diff)
UI: use consistent "Color Burn" name for blend mode
Previously it was named just "Burn" in some places. Differential Revision: https://developer.blender.org/D5186
Diffstat (limited to 'source/blender/compositor/operations')
-rw-r--r--source/blender/compositor/operations/COM_MixOperation.cpp4
-rw-r--r--source/blender/compositor/operations/COM_MixOperation.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/compositor/operations/COM_MixOperation.cpp b/source/blender/compositor/operations/COM_MixOperation.cpp
index a610cb0d1e8..ae1acd1cad0 100644
--- a/source/blender/compositor/operations/COM_MixOperation.cpp
+++ b/source/blender/compositor/operations/COM_MixOperation.cpp
@@ -162,12 +162,12 @@ void MixBlendOperation::executePixelSampled(float output[4],
/* ******** Mix Burn Operation ******** */
-MixBurnOperation::MixBurnOperation() : MixBaseOperation()
+MixColorBurnOperation::MixColorBurnOperation() : MixBaseOperation()
{
/* pass */
}
-void MixBurnOperation::executePixelSampled(float output[4], float x, float y, PixelSampler sampler)
+void MixColorBurnOperation::executePixelSampled(float output[4], float x, float y, PixelSampler sampler)
{
float inputColor1[4];
float inputColor2[4];
diff --git a/source/blender/compositor/operations/COM_MixOperation.h b/source/blender/compositor/operations/COM_MixOperation.h
index 6ea55a3edfd..fbf60fb9d37 100644
--- a/source/blender/compositor/operations/COM_MixOperation.h
+++ b/source/blender/compositor/operations/COM_MixOperation.h
@@ -95,9 +95,9 @@ class MixBlendOperation : public MixBaseOperation {
void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
};
-class MixBurnOperation : public MixBaseOperation {
+class MixColorBurnOperation : public MixBaseOperation {
public:
- MixBurnOperation();
+ MixColorBurnOperation();
void executePixelSampled(float output[4], float x, float y, PixelSampler sampler);
};