diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-06-10 19:38:23 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-06-10 19:38:23 +0300 |
| commit | 080cf9332bc9d71e0e14326bc8efdf06b738dea1 (patch) | |
| tree | e8531a509dca4d8253aa19d89edc68152421f9e5 /source/blender/nodes/shader/nodes/node_shader_mapping.c | |
| parent | 6d495cc4ef071171ff0686b2be898a41e05b8051 (diff) | |
| parent | 9676642cc94599b3419c9aaa5cf1aae2fbbd235f (diff) | |
Merge branch 'gooseberry' into temp_motionpathstemp_motionpaths
Conflicts:
source/blender/blenkernel/intern/object.c
Diffstat (limited to 'source/blender/nodes/shader/nodes/node_shader_mapping.c')
| -rw-r--r-- | source/blender/nodes/shader/nodes/node_shader_mapping.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/nodes/shader/nodes/node_shader_mapping.c b/source/blender/nodes/shader/nodes/node_shader_mapping.c index cff4a039602..2af6e19565b 100644 --- a/source/blender/nodes/shader/nodes/node_shader_mapping.c +++ b/source/blender/nodes/shader/nodes/node_shader_mapping.c @@ -71,7 +71,7 @@ static void node_shader_exec_mapping(void *UNUSED(data), int UNUSED(thread), bNo static void node_shader_init_mapping(bNodeTree *UNUSED(ntree), bNode *node) { - node->storage = add_tex_mapping(TEXMAP_TYPE_POINT); + node->storage = BKE_texture_mapping_add(TEXMAP_TYPE_POINT); } static int gpu_shader_mapping(GPUMaterial *mat, bNode *node, bNodeExecData *UNUSED(execdata), GPUNodeStack *in, GPUNodeStack *out) |