From 8eb22968724b3ac9f6ccb426b08cb865cbbcef94 Mon Sep 17 00:00:00 2001
From: EitanSomething <eitant13@gmail.com>
Date: Fri, 23 Aug 2019 13:13:59 +0200
Subject: 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
---
 source/blender/compositor/nodes/COM_MixNode.cpp           | 2 +-
 source/blender/compositor/operations/COM_MixOperation.cpp | 4 ++--
 source/blender/compositor/operations/COM_MixOperation.h   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'source/blender/compositor')

diff --git a/source/blender/compositor/nodes/COM_MixNode.cpp b/source/blender/compositor/nodes/COM_MixNode.cpp
index 27a605e28d4..b3bcefaccb5 100644
--- a/source/blender/compositor/nodes/COM_MixNode.cpp
+++ b/source/blender/compositor/nodes/COM_MixNode.cpp
@@ -52,7 +52,7 @@ void MixNode::convertToOperations(NodeConverter &converter,
       convertProg = new MixLightenOperation();
       break;
     case MA_RAMP_BURN:
-      convertProg = new MixBurnOperation();
+      convertProg = new MixColorBurnOperation();
       break;
     case MA_RAMP_HUE:
       convertProg = new MixHueOperation();
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);
 };
 
-- 
cgit v1.2.3