From 2464b1fdd1556cd8af437056b8dfff14cc0d10ee Mon Sep 17 00:00:00 2001 From: zanqdo Date: Mon, 20 Feb 2023 18:26:34 -0600 Subject: [PATCH] Rename Dilate/Erode to Dilate Erode For consistency with other similar nodes that do not use the slash separator and only use spaces --- source/blender/blenkernel/intern/mask_rasterize.c | 2 +- .../blender/compositor/nodes/COM_DilateErodeNode.h | 2 +- source/blender/compositor/nodes/COM_KeyingNode.cc | 2 +- .../compositor/operations/COM_BlurBaseOperation.cc | 2 +- .../operations/COM_DilateErodeOperation.cc | 12 ++++++------ .../operations/COM_GaussianAlphaBlurBaseOperation.h | 2 +- source/blender/makesrna/intern/rna_nodetree.c | 2 +- source/blender/nodes/NOD_static_types.h | 2 +- .../nodes/composite/nodes/node_composite_dilate.cc | 4 ++-- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/source/blender/blenkernel/intern/mask_rasterize.c b/source/blender/blenkernel/intern/mask_rasterize.c index adc0eb5f78c..da0cd36a58a 100644 --- a/source/blender/blenkernel/intern/mask_rasterize.c +++ b/source/blender/blenkernel/intern/mask_rasterize.c @@ -1334,7 +1334,7 @@ float BKE_maskrasterize_handle_sample(MaskRasterHandle *mr_handle, const float x switch (layer->falloff) { case PROP_SMOOTH: - /* ease - gives less hard lines for dilate/erode feather */ + /* ease - gives less hard lines for dilate erode feather */ value_layer = (3.0f * value_layer * value_layer - 2.0f * value_layer * value_layer * value_layer); break; diff --git a/source/blender/compositor/nodes/COM_DilateErodeNode.h b/source/blender/compositor/nodes/COM_DilateErodeNode.h index 8c6bb0d2512..49fc69bf9ba 100644 --- a/source/blender/compositor/nodes/COM_DilateErodeNode.h +++ b/source/blender/compositor/nodes/COM_DilateErodeNode.h @@ -12,7 +12,7 @@ namespace blender::compositor { * \ingroup Node */ class DilateErodeNode : public Node { - /** only used for blurring alpha, since the dilate/erode node doesn't have this. */ + /** only used for blurring alpha, since the dilate erode node doesn't have this. */ NodeBlurData alpha_blur_; public: diff --git a/source/blender/compositor/nodes/COM_KeyingNode.cc b/source/blender/compositor/nodes/COM_KeyingNode.cc index a9138f026f7..7168c22683f 100644 --- a/source/blender/compositor/nodes/COM_KeyingNode.cc +++ b/source/blender/compositor/nodes/COM_KeyingNode.cc @@ -296,7 +296,7 @@ void KeyingNode::convert_to_operations(NodeConverter &converter, postprocessed_matte = setup_post_blur(converter, postprocessed_matte, keying_data->blur_post); } - /* matte dilate/erode */ + /* matte dilate erode */ if (keying_data->dilate_distance != 0) { postprocessed_matte = setup_dilate_erode( converter, postprocessed_matte, keying_data->dilate_distance); diff --git a/source/blender/compositor/operations/COM_BlurBaseOperation.cc b/source/blender/compositor/operations/COM_BlurBaseOperation.cc index 53a5cebaf5d..150371f8f0b 100644 --- a/source/blender/compositor/operations/COM_BlurBaseOperation.cc +++ b/source/blender/compositor/operations/COM_BlurBaseOperation.cc @@ -112,7 +112,7 @@ float *BlurBaseOperation::make_dist_fac_inverse(float rad, int size, int falloff /* keep in sync with rna_enum_proportional_falloff_curve_only_items */ switch (falloff) { case PROP_SMOOTH: - /* ease - gives less hard lines for dilate/erode feather */ + /* ease - gives less hard lines for dilate erode feather */ val = (3.0f * val * val - 2.0f * val * val * val); break; case PROP_SPHERE: diff --git a/source/blender/compositor/operations/COM_DilateErodeOperation.cc b/source/blender/compositor/operations/COM_DilateErodeOperation.cc index 9a2d5e09b33..9d6bdb9720a 100644 --- a/source/blender/compositor/operations/COM_DilateErodeOperation.cc +++ b/source/blender/compositor/operations/COM_DilateErodeOperation.cc @@ -578,7 +578,7 @@ void *DilateStepOperation::initialize_tile_data(rcti *rect) "dilate erode buf"); /* The following is based on the van Herk/Gil-Werman algorithm for morphology operations. - * first pass, horizontal dilate/erode. */ + * first pass, horizontal dilate erode. */ for (y = ymin; y < ymax; y++) { for (x = 0; x < bwidth + 5 * half_window; x++) { buf[x] = -FLT_MAX; @@ -603,7 +603,7 @@ void *DilateStepOperation::initialize_tile_data(rcti *rect) } } - /* Second pass, vertical dilate/erode. */ + /* Second pass, vertical dilate erode. */ for (x = 0; x < bwidth; x++) { for (y = 0; y < bheight + 5 * half_window; y++) { buf[y] = -FLT_MAX; @@ -719,7 +719,7 @@ static void step_update_memory_buffer(MemoryBuffer *output, "dilate erode buf"); /* The following is based on the van Herk/Gil-Werman algorithm for morphology operations. */ - /* First pass, horizontal dilate/erode. */ + /* First pass, horizontal dilate erode. */ for (int y = ymin; y < ymax; y++) { for (int x = 0; x < bwidth + 5 * half_window; x++) { buf[x] = compare_min_value; @@ -744,7 +744,7 @@ static void step_update_memory_buffer(MemoryBuffer *output, } } - /* Second pass, vertical dilate/erode. */ + /* Second pass, vertical dilate erode. */ for (int x = 0; x < bwidth; x++) { for (int y = 0; y < bheight + 5 * half_window; y++) { buf[y] = compare_min_value; @@ -828,7 +828,7 @@ void *ErodeStepOperation::initialize_tile_data(rcti *rect) "dilate erode buf"); /* The following is based on the van Herk/Gil-Werman algorithm for morphology operations. - * first pass, horizontal dilate/erode */ + * first pass, horizontal dilate erode */ for (y = ymin; y < ymax; y++) { for (x = 0; x < bwidth + 5 * half_window; x++) { buf[x] = FLT_MAX; @@ -853,7 +853,7 @@ void *ErodeStepOperation::initialize_tile_data(rcti *rect) } } - /* Second pass, vertical dilate/erode. */ + /* Second pass, vertical dilate erode. */ for (x = 0; x < bwidth; x++) { for (y = 0; y < bheight + 5 * half_window; y++) { buf[y] = FLT_MAX; diff --git a/source/blender/compositor/operations/COM_GaussianAlphaBlurBaseOperation.h b/source/blender/compositor/operations/COM_GaussianAlphaBlurBaseOperation.h index da5f54208df..fa3e66f1905 100644 --- a/source/blender/compositor/operations/COM_GaussianAlphaBlurBaseOperation.h +++ b/source/blender/compositor/operations/COM_GaussianAlphaBlurBaseOperation.h @@ -30,7 +30,7 @@ class GaussianAlphaBlurBaseOperation : public BlurBaseOperation { Span inputs) final; /** - * Set subtract for Dilate/Erode functionality + * Set subtract for Dilate Erode functionality */ void set_subtract(bool subtract) { diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index 71d6c72c05d..dec18baa69c 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -8871,7 +8871,7 @@ static void def_cmp_keying(StructRNA *srna) prop = RNA_def_property(srna, "dilate_distance", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "dilate_distance"); RNA_def_property_range(prop, -100, 100); - RNA_def_property_ui_text(prop, "Dilate/Erode", "Matte dilate/erode side"); + RNA_def_property_ui_text(prop, "Dilate Erode", "Matte dilate erode side"); RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_update"); prop = RNA_def_property(srna, "edge_kernel_radius", PROP_INT, PROP_NONE); diff --git a/source/blender/nodes/NOD_static_types.h b/source/blender/nodes/NOD_static_types.h index cb97e88ac9f..8265b79b19e 100644 --- a/source/blender/nodes/NOD_static_types.h +++ b/source/blender/nodes/NOD_static_types.h @@ -153,7 +153,7 @@ DefNode(CompositorNode, CMP_NODE_TEXTURE, def_texture, "TEXTUR DefNode(CompositorNode, CMP_NODE_TRANSLATE, def_cmp_translate, "TRANSLATE", Translate, "Translate", "" ) DefNode(CompositorNode, CMP_NODE_ZCOMBINE, def_cmp_zcombine, "ZCOMBINE", Zcombine, "Z Combine", "" ) DefNode(CompositorNode, CMP_NODE_COMBRGBA_LEGACY,0, "COMBRGBA", CombRGBA, "Combine RGBA", "" ) -DefNode(CompositorNode, CMP_NODE_DILATEERODE, def_cmp_dilate_erode, "DILATEERODE", DilateErode, "Dilate/Erode", "" ) +DefNode(CompositorNode, CMP_NODE_DILATEERODE, def_cmp_dilate_erode, "DILATEERODE", DilateErode, "Dilate Erode", "" ) DefNode(CompositorNode, CMP_NODE_INPAINT, def_cmp_inpaint, "INPAINT", Inpaint, "Inpaint", "" ) DefNode(CompositorNode, CMP_NODE_DESPECKLE, def_cmp_despeckle, "DESPECKLE", Despeckle, "Despeckle", "" ) DefNode(CompositorNode, CMP_NODE_ROTATE, def_cmp_rotate, "ROTATE", Rotate, "Rotate", "" ) diff --git a/source/blender/nodes/composite/nodes/node_composite_dilate.cc b/source/blender/nodes/composite/nodes/node_composite_dilate.cc index b34a7bd6646..b05ebad2b09 100644 --- a/source/blender/nodes/composite/nodes/node_composite_dilate.cc +++ b/source/blender/nodes/composite/nodes/node_composite_dilate.cc @@ -24,7 +24,7 @@ #include "node_composite_util.hh" -/* **************** Dilate/Erode ******************** */ +/* **************** Dilate Erode ******************** */ namespace blender::nodes::node_composite_dilate_cc { @@ -377,7 +377,7 @@ void register_node_type_cmp_dilateerode() static bNodeType ntype; - cmp_node_type_base(&ntype, CMP_NODE_DILATEERODE, "Dilate/Erode", NODE_CLASS_OP_FILTER); + cmp_node_type_base(&ntype, CMP_NODE_DILATEERODE, "Dilate Erode", NODE_CLASS_OP_FILTER); ntype.draw_buttons = file_ns::node_composit_buts_dilateerode; ntype.declare = file_ns::cmp_node_dilate_declare; ntype.initfunc = file_ns::node_composit_init_dilateerode; -- 2.30.2