← Back to branch summary

~ubuntu-branches/ubuntu/utopic/blender/utopic-proposed

« back to all changes in this revision

Viewing changes to source/blender/nodes/shader/nodes/node_shader_tex_image.c

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2014-02-19 11:24:23 UTC
  • mfrom: (14.2.23 sid)
  • Revision ID: package-import@ubuntu.com-20140219112423-rkmaz2m7ha06d4tk
Tags: 2.69-3ubuntu1
* Merge with Debian; remaining changes:
  - Configure without OpenImageIO on armhf, as it is not available on
    Ubuntu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/nodes/shader/nodes/node_shader_tex_image.c
45
45
static void node_shader_init_tex_image(bNodeTree *UNUSED(ntree), bNode *node)
46
46
{
47
47
        NodeTexImage *tex = MEM_callocN(sizeof(NodeTexImage), "NodeTexImage");
48
 
        default_tex_mapping(&tex->base.tex_mapping);
 
48
        default_tex_mapping(&tex->base.tex_mapping, TEXMAP_TYPE_POINT);
49
49
        default_color_mapping(&tex->base.color_mapping);
50
50
        tex->color_space = SHD_COLORSPACE_COLOR;
51
51
        tex->iuser.frames = 1;