UI: use consistent "Color Burn" name for blend mode
authorEitanSomething <eitant13@gmail.com>
Fri, 23 Aug 2019 11:13:59 +0000 (13:13 +0200)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Fri, 23 Aug 2019 11:14:15 +0000 (13:14 +0200)
Previously it was named just "Burn" in some places.

Differential Revision: https://developer.blender.org/D5186

source/blender/blenkernel/intern/seqeffects.c
source/blender/compositor/nodes/COM_MixNode.cpp
source/blender/compositor/operations/COM_MixOperation.cpp
source/blender/compositor/operations/COM_MixOperation.h
source/blender/makesdna/DNA_sequence_types.h
source/blender/makesrna/intern/rna_material.c
source/blender/makesrna/intern/rna_sequencer.c

index b151bc7f0922fe9b9f0547bef1f6fbdc9bf8b02b..89f3f9ef9fd1ddab9b186445e7ef297b6e84b262 100644 (file)
@@ -1646,7 +1646,7 @@ static void do_blend_effect_float(
     case SEQ_TYPE_DARKEN:
       apply_blend_function_float(facf0, facf1, x, y, rect1, rect2, out, blend_color_darken_float);
       break;
-    case SEQ_TYPE_BURN:
+    case SEQ_TYPE_COLOR_BURN:
       apply_blend_function_float(facf0, facf1, x, y, rect1, rect2, out, blend_color_burn_float);
       break;
     case SEQ_TYPE_LINEAR_BURN:
@@ -1734,7 +1734,7 @@ static void do_blend_effect_byte(float facf0,
     case SEQ_TYPE_DARKEN:
       apply_blend_function_byte(facf0, facf1, x, y, rect1, rect2, out, blend_color_darken_byte);
       break;
-    case SEQ_TYPE_BURN:
+    case SEQ_TYPE_COLOR_BURN:
       apply_blend_function_byte(facf0, facf1, x, y, rect1, rect2, out, blend_color_burn_byte);
       break;
     case SEQ_TYPE_LINEAR_BURN:
@@ -4130,7 +4130,7 @@ static struct SeqEffectHandle get_sequence_effect_impl(int seq_type)
       break;
     case SEQ_TYPE_SCREEN:
     case SEQ_TYPE_OVERLAY:
-    case SEQ_TYPE_BURN:
+    case SEQ_TYPE_COLOR_BURN:
     case SEQ_TYPE_LINEAR_BURN:
     case SEQ_TYPE_DARKEN:
     case SEQ_TYPE_LIGHTEN:
index 27a605e28d4dbc08ef713ac49056cc8b457de575..b3bcefaccb57c3c21c4c0b639105922bd331c298 100644 (file)
@@ -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();
index a610cb0d1e8a6b9b1c4fff454a3f682e6a187d97..ae1acd1cad0392c443c4762c7610da97e82908f4 100644 (file)
@@ -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];
index 6ea55a3edfd02f863b9cdf1c9ec8c5ae87dd4d90..fbf60fb9d374c81f3f04aaa943ff4cd70ec54079 100644 (file)
@@ -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);
 };
 
index 5240de4aff9eedbbeff472c7a9795bc587e2dc9a..087d30ce3123d1f4c19fa0272cd619694e51d400 100644 (file)
@@ -584,7 +584,7 @@ enum {
   SEQ_TYPE_LIGHTEN = 44,
   SEQ_TYPE_DODGE = 45,
   SEQ_TYPE_DARKEN = 46,
-  SEQ_TYPE_BURN = 47,
+  SEQ_TYPE_COLOR_BURN = 47,
   SEQ_TYPE_LINEAR_BURN = 48,
   SEQ_TYPE_OVERLAY = 49,
   SEQ_TYPE_HARD_LIGHT = 50,
index e6c432bec6c6e8b9d1f9fd205f644432dbbb15ee..8f627ce36ef49bbdd22a01337ceebb43f7e1493b 100644 (file)
@@ -37,7 +37,7 @@ const EnumPropertyItem rna_enum_ramp_blend_items[] = {
     {0, "", ICON_NONE, NULL, NULL},
     {MA_RAMP_DARK, "DARKEN", 0, "Darken", ""},
     {MA_RAMP_MULT, "MULTIPLY", 0, "Multiply", ""},
-    {MA_RAMP_BURN, "BURN", 0, "Burn", ""},
+    {MA_RAMP_BURN, "BURN", 0, "Color Burn", ""},
     {0, "", ICON_NONE, NULL, NULL},
     {MA_RAMP_LIGHT, "LIGHTEN", 0, "Lighten", ""},
     {MA_RAMP_SCREEN, "SCREEN", 0, "Screen", ""},
index 572cebec6adfc07befa5b6c4ca489fa7f72a63a0..883468fa88e20a846c82cd495934a42c44569589 100644 (file)
@@ -1457,7 +1457,7 @@ static const EnumPropertyItem blend_mode_items[] = {
     {0, "", ICON_NONE, NULL, NULL},
     {SEQ_TYPE_DARKEN, "DARKEN", 0, "Darken", ""},
     {SEQ_TYPE_MUL, "MULTIPLY", 0, "Multiply", ""},
-    {SEQ_TYPE_BURN, "BURN", 0, "Burn", ""},
+    {SEQ_TYPE_COLOR_BURN, "BURN", 0, "Color Burn", ""},
     {SEQ_TYPE_LINEAR_BURN, "LINEAR_BURN", 0, "Linear Burn", ""},
     {0, "", ICON_NONE, NULL, NULL},
     {SEQ_TYPE_LIGHTEN, "LIGHTEN", 0, "Lighten", ""},
@@ -2792,7 +2792,7 @@ static void rna_def_color_mix(StructRNA *srna)
       {SEQ_TYPE_SCREEN, "SCREEN", 0, "Screen", ""},
       {SEQ_TYPE_OVERLAY, "OVERLAY", 0, "Overlay", ""},
       {SEQ_TYPE_DODGE, "DODGE", 0, "Dodge", ""},
-      {SEQ_TYPE_BURN, "BURN", 0, "Burn", ""},
+      {SEQ_TYPE_COLOR_BURN, "BURN", 0, "Color Burn", ""},
       {SEQ_TYPE_LINEAR_BURN, "LINEAR_BURN", 0, "Linear Burn", ""},
       {SEQ_TYPE_SOFT_LIGHT, "SOFT_LIGHT", 0, "Soft Light", ""},
       {SEQ_TYPE_HARD_LIGHT, "HARD_LIGHT", 0, "Hard Light", ""},