From a47e6810a28714a840a83262734b109a3ac78747 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Wed, 2 Oct 2013 17:02:59 +0000 Subject: Fixes for cycles Mapping and Vector Transform node: * Keep the Mapping node default type as Point for now, instead of Texture. The latter is a better default, but this is breaking API compatibility and it's too close to release to expect addons to be fixed in time. * Vector Transform and Mapping nodes had properties with name "type" to set the type of vector, but this conflicts with the node type property, so renamed to vector_type now. --- source/blender/makesrna/intern/rna_nodetree.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'source/blender/makesrna/intern/rna_nodetree.c') diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index 2759cde99ad..287b672d270 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -3147,7 +3147,7 @@ static void def_sh_mapping(StructRNA *srna) RNA_def_struct_sdna_from(srna, "TexMapping", "storage"); - prop = RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE); + prop = RNA_def_property(srna, "vector_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "type"); RNA_def_property_enum_items(prop, prop_vect_type_items); RNA_def_property_ui_text(prop, "Type", "Type of vector that the mapping transforms"); @@ -3553,7 +3553,8 @@ static void def_sh_vect_transform(StructRNA *srna) RNA_def_struct_sdna_from(srna, "NodeShaderVectTransform", "storage"); - prop = RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE); + prop = RNA_def_property(srna, "vector_type", PROP_ENUM, PROP_NONE); + RNA_def_property_enum_sdna(prop, NULL, "type"); RNA_def_property_enum_items(prop, prop_vect_type_items); RNA_def_property_ui_text(prop, "Type", ""); RNA_def_property_update(prop, 0, "rna_Node_update"); -- cgit v1.2.3