[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45400] trunk/blender: Fix #30803: shader node Mapping location property conflicted with based class
Brecht Van Lommel
brechtvanlommel at pandora.be
Wed Apr 4 18:11:40 CEST 2012
Revision: 45400
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45400
Author: blendix
Date: 2012-04-04 16:11:39 +0000 (Wed, 04 Apr 2012)
Log Message:
-----------
Fix #30803: shader node Mapping location property conflicted with based class
location property (for the node editor), now renamed to "translation".
Modified Paths:
--------------
trunk/blender/intern/cycles/blender/addon/ui.py
trunk/blender/intern/cycles/blender/blender_shader.cpp
trunk/blender/source/blender/editors/space_node/drawnode.c
trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
trunk/blender/source/blender/makesrna/intern/rna_texture.c
Modified: trunk/blender/intern/cycles/blender/addon/ui.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/ui.py 2012-04-04 16:11:10 UTC (rev 45399)
+++ trunk/blender/intern/cycles/blender/addon/ui.py 2012-04-04 16:11:39 UTC (rev 45400)
@@ -727,7 +727,7 @@
row = layout.row()
- row.column().prop(mapping, "location")
+ row.column().prop(mapping, "translation")
row.column().prop(mapping, "rotation")
row.column().prop(mapping, "scale")
Modified: trunk/blender/intern/cycles/blender/blender_shader.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_shader.cpp 2012-04-04 16:11:10 UTC (rev 45399)
+++ trunk/blender/intern/cycles/blender/blender_shader.cpp 2012-04-04 16:11:39 UTC (rev 45400)
@@ -80,7 +80,7 @@
if(!b_mapping)
return;
- mapping->translation = get_float3(b_mapping.location());
+ mapping->translation = get_float3(b_mapping.translation());
mapping->rotation = get_float3(b_mapping.rotation());
mapping->scale = get_float3(b_mapping.scale());
@@ -94,7 +94,7 @@
if(!b_mapping)
return;
- mapping->translation = get_float3(b_mapping.location());
+ mapping->translation = get_float3(b_mapping.translation());
mapping->rotation = get_float3(b_mapping.rotation());
mapping->scale = get_float3(b_mapping.scale());
}
Modified: trunk/blender/source/blender/editors/space_node/drawnode.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/drawnode.c 2012-04-04 16:11:10 UTC (rev 45399)
+++ trunk/blender/source/blender/editors/space_node/drawnode.c 2012-04-04 16:11:39 UTC (rev 45400)
@@ -1035,7 +1035,7 @@
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);
Modified: trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_nodetree.c 2012-04-04 16:11:10 UTC (rev 45399)
+++ trunk/blender/source/blender/makesrna/intern/rna_nodetree.c 2012-04-04 16:11:39 UTC (rev 45400)
@@ -1173,7 +1173,7 @@
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");
Modified: trunk/blender/source/blender/makesrna/intern/rna_texture.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_texture.c 2012-04-04 16:11:10 UTC (rev 45399)
+++ trunk/blender/source/blender/makesrna/intern/rna_texture.c 2012-04-04 16:11:39 UTC (rev 45400)
@@ -468,7 +468,7 @@
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");
More information about the Bf-blender-cvs
mailing list