diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-04-04 20:11:39 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-04-04 20:11:39 +0400 |
| commit | d7d8c668ca78bf2e4f3a7a825db8e5b197d7a4b7 (patch) | |
| tree | 93db8e17508b017ad484ef903320b02740e249b4 /source | |
| parent | 503785649d1aa96cd162a8cd2b9ed7b36abcf21c (diff) | |
Fix #30803: shader node Mapping location property conflicted with based class
location property (for the node editor), now renamed to "translation".
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/space_node/drawnode.c | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_nodetree.c | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_texture.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index 7176c86cb11..42aea32b7f6 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -1035,7 +1035,7 @@ static void node_shader_buts_mapping(uiLayout *layout, bContext *UNUSED(C), Poin uiItemL(layout, "Location:", ICON_NONE); row= uiLayoutRow(layout, 1); - uiItemR(row, ptr, "location", 0, "", ICON_NONE); + uiItemR(row, ptr, "translation", 0, "", ICON_NONE); uiItemL(layout, "Rotation:", ICON_NONE); row= uiLayoutRow(layout, 1); diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index 1dc5c9c050c..53c2d1b847a 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -1173,7 +1173,7 @@ static void def_sh_mapping(StructRNA *srna) RNA_def_struct_sdna_from(srna, "TexMapping", "storage"); - prop = RNA_def_property(srna, "location", PROP_FLOAT, PROP_TRANSLATION); + prop = RNA_def_property(srna, "translation", PROP_FLOAT, PROP_TRANSLATION); RNA_def_property_float_sdna(prop, NULL, "loc"); RNA_def_property_ui_text(prop, "Location", ""); RNA_def_property_update(prop, 0, "rna_Mapping_Node_update"); diff --git a/source/blender/makesrna/intern/rna_texture.c b/source/blender/makesrna/intern/rna_texture.c index 6a3dee72849..c77f312cd05 100644 --- a/source/blender/makesrna/intern/rna_texture.c +++ b/source/blender/makesrna/intern/rna_texture.c @@ -468,7 +468,7 @@ static void rna_def_texmapping(BlenderRNA *brna) srna = RNA_def_struct(brna, "TexMapping", NULL); RNA_def_struct_ui_text(srna, "Texture Mapping", "Texture coordinate mapping settings"); - prop = RNA_def_property(srna, "location", PROP_FLOAT, PROP_TRANSLATION); + prop = RNA_def_property(srna, "translation", PROP_FLOAT, PROP_TRANSLATION); RNA_def_property_float_sdna(prop, NULL, "loc"); RNA_def_property_ui_text(prop, "Location", ""); RNA_def_property_update(prop, 0, "rna_Texture_mapping_update"); |