From d7d8c668ca78bf2e4f3a7a825db8e5b197d7a4b7 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Wed, 4 Apr 2012 16:11:39 +0000 Subject: Fix #30803: shader node Mapping location property conflicted with based class location property (for the node editor), now renamed to "translation". --- source/blender/makesrna/intern/rna_texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source/blender/makesrna/intern/rna_texture.c') 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"); -- cgit v1.2.3