diff options
| author | Miika Hamalainen <blender@miikah.org> | 2011-11-09 19:46:53 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2011-11-09 19:46:53 +0400 |
| commit | 1b4a54ad73c058baa59ffdc9e5f18b0b79030fb0 (patch) | |
| tree | a5b84d392ea14b0d760a5e24f7a8e51f203d558c /source/blender/nodes/shader/nodes/node_shader_mapping.c | |
| parent | edec46b0a6aac18f406991b9e16228d4bd848c61 (diff) | |
| parent | bc5ec4e69cf3308c2563239c0e8372b853800a78 (diff) | |
Merge with trunk r41701soc-2011-carrot
Diffstat (limited to 'source/blender/nodes/shader/nodes/node_shader_mapping.c')
| -rw-r--r-- | source/blender/nodes/shader/nodes/node_shader_mapping.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/nodes/shader/nodes/node_shader_mapping.c b/source/blender/nodes/shader/nodes/node_shader_mapping.c index 862c52187dc..2fa885dcdd3 100644 --- a/source/blender/nodes/shader/nodes/node_shader_mapping.c +++ b/source/blender/nodes/shader/nodes/node_shader_mapping.c @@ -69,7 +69,7 @@ static void node_shader_exec_mapping(void *UNUSED(data), bNode *node, bNodeStack static void node_shader_init_mapping(bNodeTree *UNUSED(ntree), bNode* node, bNodeTemplate *UNUSED(ntemp)) { - node->storage= add_mapping(); + node->storage= add_tex_mapping(); } static int gpu_shader_mapping(GPUMaterial *mat, bNode *node, GPUNodeStack *in, GPUNodeStack *out) @@ -91,7 +91,7 @@ void register_node_type_sh_mapping(ListBase *lb) static bNodeType ntype; node_type_base(&ntype, SH_NODE_MAPPING, "Mapping", NODE_CLASS_OP_VECTOR, NODE_OPTIONS); - node_type_compatibility(&ntype, NODE_OLD_SHADING); + node_type_compatibility(&ntype, NODE_OLD_SHADING|NODE_NEW_SHADING); node_type_socket_templates(&ntype, sh_node_mapping_in, sh_node_mapping_out); node_type_size(&ntype, 240, 160, 320); node_type_init(&ntype, node_shader_init_mapping); |