diff options
author | OmarSquircleArt <omar.squircleart@gmail.com> | 2019-09-06 17:06:02 +0300 |
---|---|---|
committer | YimingWu <xp8110@outlook.com> | 2019-09-12 04:13:02 +0300 |
commit | 7e14b9807bef0aa4831127995b7064e0e6e62928 (patch) | |
tree | 467af86765a81fbd20a321f8e2e059c4208a6187 /source | |
parent | a4d467389225a9463959a315f47c6700c836c4f1 (diff) |
Fix: Rename the dimensions property in Noise nodes.
The `dimensions` property of the noise nodes has been renamed to
`noise_dimensions` because it conflicted with and overwrote the
`dimensions` property of the base node.
Reviewers: brecht, JacquesLucke
Differential Revision: https://developer.blender.org/D5705
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/space_node/drawnode.c | 4 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_nodetree.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index 8e6b09be2c7..c0980a1d2e9 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -920,7 +920,7 @@ static void node_shader_buts_tex_voronoi(uiLayout *layout, bContext *UNUSED(C), static void node_shader_buts_tex_noise(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) { - uiItemR(layout, ptr, "dimensions", 0, "", ICON_NONE); + uiItemR(layout, ptr, "noise_dimensions", 0, "", ICON_NONE); } static void node_shader_buts_tex_pointdensity(uiLayout *layout, @@ -1164,7 +1164,7 @@ static void node_shader_buts_ambient_occlusion(uiLayout *layout, static void node_shader_buts_white_noise(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) { - uiItemR(layout, ptr, "dimensions", 0, "", ICON_NONE); + uiItemR(layout, ptr, "noise_dimensions", 0, "", ICON_NONE); } /* only once called */ diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index 6a4d59bd883..7587b486118 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -4309,7 +4309,7 @@ static void def_sh_tex_noise(StructRNA *srna) RNA_def_struct_sdna_from(srna, "NodeTexNoise", "storage"); def_sh_tex(srna); - prop = RNA_def_property(srna, "dimensions", PROP_ENUM, PROP_NONE); + prop = RNA_def_property(srna, "noise_dimensions", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "dimensions"); RNA_def_property_enum_items(prop, rna_enum_node_tex_dimensions_items); RNA_def_property_ui_text( @@ -4479,7 +4479,7 @@ static void def_sh_tex_white_noise(StructRNA *srna) { PropertyRNA *prop; - prop = RNA_def_property(srna, "dimensions", PROP_ENUM, PROP_NONE); + prop = RNA_def_property(srna, "noise_dimensions", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "custom1"); RNA_def_property_enum_items(prop, rna_enum_node_tex_dimensions_items); RNA_def_property_ui_text( |