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/blender/makesrna/intern/rna_texture.c | |
| 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/blender/makesrna/intern/rna_texture.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_texture.c | 2 |
1 files changed, 1 insertions, 1 deletions
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"); |