From f7e8021b2ad74ad2cbd8e2781197649f5d7e71af Mon Sep 17 00:00:00 2001 From: Hoshinova Date: Mon, 18 Dec 2023 10:35:20 +0100 Subject: [PATCH] Fix #116256: Unintentional override of node type property in API Rename new noise node type to avoid conflict with node type. Pull Request: https://projects.blender.org/blender/blender/pulls/116278 --- intern/cycles/blender/shader.cpp | 2 +- source/blender/makesrna/intern/rna_nodetree.cc | 2 +- source/blender/nodes/shader/nodes/node_shader_tex_noise.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/intern/cycles/blender/shader.cpp b/intern/cycles/blender/shader.cpp index c40506242b2..998be73d555 100644 --- a/intern/cycles/blender/shader.cpp +++ b/intern/cycles/blender/shader.cpp @@ -936,7 +936,7 @@ static ShaderNode *add_node(Scene *scene, BL::ShaderNodeTexNoise b_noise_node(b_node); NoiseTextureNode *noise = graph->create_node(); noise->set_dimensions(b_noise_node.noise_dimensions()); - noise->set_type((NodeNoiseType)b_noise_node.type()); + noise->set_type((NodeNoiseType)b_noise_node.noise_type()); noise->set_use_normalize(b_noise_node.normalize()); BL::TexMapping b_texture_mapping(b_noise_node.texture_mapping()); get_tex_mapping(noise, b_texture_mapping); diff --git a/source/blender/makesrna/intern/rna_nodetree.cc b/source/blender/makesrna/intern/rna_nodetree.cc index f4e2c280b4d..a144b6ff24b 100644 --- a/source/blender/makesrna/intern/rna_nodetree.cc +++ b/source/blender/makesrna/intern/rna_nodetree.cc @@ -4920,7 +4920,7 @@ static void def_sh_tex_noise(StructRNA *srna) RNA_def_property_ui_text(prop, "Dimensions", "Number of dimensions to output noise for"); RNA_def_property_update(prop, 0, "rna_ShaderNode_socket_update"); - prop = RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE); + prop = RNA_def_property(srna, "noise_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, nullptr, "type"); RNA_def_property_enum_items(prop, prop_noise_type); RNA_def_property_ui_text(prop, "Type", "Type of the Noise texture"); diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_noise.cc b/source/blender/nodes/shader/nodes/node_shader_tex_noise.cc index d3f23f02139..2ba410bdd6f 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_noise.cc +++ b/source/blender/nodes/shader/nodes/node_shader_tex_noise.cc @@ -50,7 +50,7 @@ static void sh_node_tex_noise_declare(NodeDeclarationBuilder &b) static void node_shader_buts_tex_noise(uiLayout *layout, bContext * /*C*/, PointerRNA *ptr) { uiItemR(layout, ptr, "noise_dimensions", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE); - uiItemR(layout, ptr, "type", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE); + uiItemR(layout, ptr, "noise_type", UI_ITEM_R_SPLIT_EMPTY_NAME, "", ICON_NONE); if (ELEM(RNA_enum_get(ptr, "type"), SHD_NOISE_FBM)) { uiItemR(layout, ptr, "normalize", UI_ITEM_R_SPLIT_EMPTY_NAME, nullptr, ICON_NONE); }