Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2013-10-02 21:02:59 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2013-10-02 21:02:59 +0400
commita47e6810a28714a840a83262734b109a3ac78747 (patch)
treee194a32245e8467e6f5b10f823c95ceeb850837e /source/blender/nodes/shader/nodes/node_shader_tex_magic.c
parentba01e5e3ebf4d94f8837dff1d263331e1bf412be (diff)
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.
Diffstat (limited to 'source/blender/nodes/shader/nodes/node_shader_tex_magic.c')
-rw-r--r--source/blender/nodes/shader/nodes/node_shader_tex_magic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_magic.c b/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
index c043484d550..b9339bc483f 100644
--- a/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
+++ b/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
@@ -45,7 +45,7 @@ static bNodeSocketTemplate sh_node_tex_magic_out[] = {
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;