diff options
Diffstat (limited to 'source')
7 files changed, 12 insertions, 12 deletions
diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c index b151bc7f092..89f3f9ef9fd 100644 --- a/source/blender/blenkernel/intern/seqeffects.c +++ b/source/blender/blenkernel/intern/seqeffects.c @@ -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: 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); }; diff --git a/source/blender/makesdna/DNA_sequence_types.h b/source/blender/makesdna/DNA_sequence_types.h index 5240de4aff9..087d30ce312 100644 --- a/source/blender/makesdna/DNA_sequence_types.h +++ b/source/blender/makesdna/DNA_sequence_types.h @@ -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, diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c index e6c432bec6c..8f627ce36ef 100644 --- a/source/blender/makesrna/intern/rna_material.c +++ b/source/blender/makesrna/intern/rna_material.c @@ -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", ""}, diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c index 572cebec6ad..883468fa88e 100644 --- a/source/blender/makesrna/intern/rna_sequencer.c +++ b/source/blender/makesrna/intern/rna_sequencer.c @@ -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", ""}, |