[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60507] trunk/blender: Fixes for cycles Mapping and Vector Transform node:
Brecht Van Lommel
brechtvanlommel at pandora.be
Wed Oct 2 19:02:59 CEST 2013
Revision: 60507
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60507
Author: blendix
Date: 2013-10-02 17:02:59 +0000 (Wed, 02 Oct 2013)
Log Message:
-----------
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.
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
trunk/blender/source/blender/nodes/shader/nodes/node_shader_mapping.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_brick.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_checker.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_image.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_noise.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
Modified: trunk/blender/intern/cycles/blender/addon/ui.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/ui.py 2013-10-02 16:37:47 UTC (rev 60506)
+++ trunk/blender/intern/cycles/blender/addon/ui.py 2013-10-02 17:02:59 UTC (rev 60507)
@@ -1085,7 +1085,7 @@
mapping = node.texture_mapping
- layout.prop(mapping, "type", expand=True)
+ layout.prop(mapping, "vector_type", expand=True)
row = layout.row()
Modified: trunk/blender/intern/cycles/blender/blender_shader.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_shader.cpp 2013-10-02 16:37:47 UTC (rev 60506)
+++ trunk/blender/intern/cycles/blender/blender_shader.cpp 2013-10-02 17:02:59 UTC (rev 60507)
@@ -147,7 +147,7 @@
mapping->translation = get_float3(b_mapping.translation());
mapping->rotation = get_float3(b_mapping.rotation());
mapping->scale = get_float3(b_mapping.scale());
- mapping->type = (TextureMapping::Type)b_mapping.type();
+ mapping->type = (TextureMapping::Type)b_mapping.vector_type();
mapping->x_mapping = (TextureMapping::Mapping)b_mapping.mapping_x();
mapping->y_mapping = (TextureMapping::Mapping)b_mapping.mapping_y();
@@ -162,7 +162,7 @@
mapping->translation = get_float3(b_mapping.translation());
mapping->rotation = get_float3(b_mapping.rotation());
mapping->scale = get_float3(b_mapping.scale());
- mapping->type = (TextureMapping::Type)b_mapping.type();
+ mapping->type = (TextureMapping::Type)b_mapping.vector_type();
mapping->use_minmax = b_mapping.use_min() || b_mapping.use_max();
Modified: trunk/blender/source/blender/editors/space_node/drawnode.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/drawnode.c 2013-10-02 16:37:47 UTC (rev 60506)
+++ trunk/blender/source/blender/editors/space_node/drawnode.c 2013-10-02 17:02:59 UTC (rev 60507)
@@ -709,7 +709,7 @@
{
uiLayout *row;
- uiItemR(layout, ptr, "type", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
+ uiItemR(layout, ptr, "vector_type", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
uiItemL(layout, IFACE_("Location:"), ICON_NONE);
row = uiLayoutRow(layout, TRUE);
@@ -739,7 +739,7 @@
static void node_shader_buts_vect_transform(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
{
- uiItemR(layout, ptr, "type", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
+ uiItemR(layout, ptr, "vector_type", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
uiItemR(layout, ptr, "convert_from", 0, "", ICON_NONE);
uiItemR(layout, ptr, "convert_to", 0, "", ICON_NONE);
}
Modified: trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_nodetree.c 2013-10-02 16:37:47 UTC (rev 60506)
+++ trunk/blender/source/blender/makesrna/intern/rna_nodetree.c 2013-10-02 17:02:59 UTC (rev 60507)
@@ -3147,7 +3147,7 @@
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 @@
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");
Modified: trunk/blender/source/blender/makesrna/intern/rna_texture.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_texture.c 2013-10-02 16:37:47 UTC (rev 60506)
+++ trunk/blender/source/blender/makesrna/intern/rna_texture.c 2013-10-02 17:02:59 UTC (rev 60507)
@@ -517,7 +517,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, "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");
Modified: trunk/blender/source/blender/nodes/shader/nodes/node_shader_mapping.c
===================================================================
--- trunk/blender/source/blender/nodes/shader/nodes/node_shader_mapping.c 2013-10-02 16:37:47 UTC (rev 60506)
+++ trunk/blender/source/blender/nodes/shader/nodes/node_shader_mapping.c 2013-10-02 17:02:59 UTC (rev 60507)
@@ -71,7 +71,7 @@
static void node_shader_init_mapping(bNodeTree *UNUSED(ntree), bNode *node)
{
- node->storage = add_tex_mapping(TEXMAP_TYPE_TEXTURE);
+ node->storage = add_tex_mapping(TEXMAP_TYPE_POINT);
}
static int gpu_shader_mapping(GPUMaterial *mat, bNode *node, bNodeExecData *UNUSED(execdata), GPUNodeStack *in, GPUNodeStack *out)
Modified: trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_brick.c
===================================================================
--- trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_brick.c 2013-10-02 16:37:47 UTC (rev 60506)
+++ trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_brick.c 2013-10-02 17:02:59 UTC (rev 60507)
@@ -51,7 +51,7 @@
static void node_shader_init_tex_brick(bNodeTree *UNUSED(ntree), bNode *node)
{
NodeTexBrick *tex = MEM_callocN(sizeof(NodeTexBrick), "NodeTexBrick");
- default_tex_mapping(&tex->base.tex_mapping, TEXMAP_TYPE_TEXTURE);
+ default_tex_mapping(&tex->base.tex_mapping, TEXMAP_TYPE_POINT);
default_color_mapping(&tex->base.color_mapping);
tex->offset = 0.5f;
Modified: trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_checker.c
===================================================================
--- trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_checker.c 2013-10-02 16:37:47 UTC (rev 60506)
+++ trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_checker.c 2013-10-02 17:02:59 UTC (rev 60507)
@@ -46,7 +46,7 @@
static void node_shader_init_tex_checker(bNodeTree *UNUSED(ntree), bNode *node)
{
NodeTexChecker *tex = MEM_callocN(sizeof(NodeTexChecker), "NodeTexChecker");
- default_tex_mapping(&tex->base.tex_mapping, TEXMAP_TYPE_TEXTURE);
+ default_tex_mapping(&tex->base.tex_mapping, TEXMAP_TYPE_POINT);
default_color_mapping(&tex->base.color_mapping);
node->storage = tex;
Modified: trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
===================================================================
--- trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_environment.c 2013-10-02 16:37:47 UTC (rev 60506)
+++ trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_environment.c 2013-10-02 17:02:59 UTC (rev 60507)
@@ -44,7 +44,7 @@
static void node_shader_init_tex_environment(bNodeTree *UNUSED(ntree), bNode *node)
{
NodeTexEnvironment *tex = MEM_callocN(sizeof(NodeTexEnvironment), "NodeTexEnvironment");
- default_tex_mapping(&tex->base.tex_mapping, TEXMAP_TYPE_TEXTURE);
+ default_tex_mapping(&tex->base.tex_mapping, TEXMAP_TYPE_POINT);
default_color_mapping(&tex->base.color_mapping);
tex->color_space = SHD_COLORSPACE_COLOR;
tex->projection = SHD_PROJ_EQUIRECTANGULAR;
Modified: trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
===================================================================
--- trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c 2013-10-02 16:37:47 UTC (rev 60506)
+++ trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c 2013-10-02 17:02:59 UTC (rev 60507)
@@ -43,7 +43,7 @@
static void node_shader_init_tex_gradient(bNodeTree *UNUSED(ntree), bNode *node)
{
NodeTexGradient *tex = MEM_callocN(sizeof(NodeTexGradient), "NodeTexGradient");
- default_tex_mapping(&tex->base.tex_mapping, TEXMAP_TYPE_TEXTURE);
+ default_tex_mapping(&tex->base.tex_mapping, TEXMAP_TYPE_POINT);
default_color_mapping(&tex->base.color_mapping);
tex->gradient_type = SHD_BLEND_LINEAR;
Modified: trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_image.c
===================================================================
--- trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_image.c 2013-10-02 16:37:47 UTC (rev 60506)
+++ trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_image.c 2013-10-02 17:02:59 UTC (rev 60507)
@@ -45,7 +45,7 @@
static void node_shader_init_tex_image(bNodeTree *UNUSED(ntree), bNode *node)
{
NodeTexImage *tex = MEM_callocN(sizeof(NodeTexImage), "NodeTexImage");
- default_tex_mapping(&tex->base.tex_mapping, TEXMAP_TYPE_TEXTURE);
+ default_tex_mapping(&tex->base.tex_mapping, TEXMAP_TYPE_POINT);
default_color_mapping(&tex->base.color_mapping);
tex->color_space = SHD_COLORSPACE_COLOR;
tex->iuser.frames = 1;
Modified: trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
===================================================================
--- trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_magic.c 2013-10-02 16:37:47 UTC (rev 60506)
+++ trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_magic.c 2013-10-02 17:02:59 UTC (rev 60507)
@@ -45,7 +45,7 @@
static void node_shader_init_tex_magic(bNodeTree *UNUSED(ntree), bNode *node)
{
NodeTexMagic *tex = MEM_callocN(sizeof(NodeTexMagic), "NodeTexMagic");
- default_tex_mapping(&tex->base.tex_mapping, TEXMAP_TYPE_TEXTURE);
+ default_tex_mapping(&tex->base.tex_mapping, TEXMAP_TYPE_POINT);
default_color_mapping(&tex->base.color_mapping);
tex->depth = 2;
Modified: trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
===================================================================
--- trunk/blender/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c 2013-10-02 16:37:47 UTC (rev 60506)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list