diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2016-02-21 00:36:02 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-04-18 20:42:19 +0300 |
| commit | 0a4cded91eeda7a08611d9f894ce29086663bfa8 (patch) | |
| tree | 84b1fec33dfa9cd80ebe9772c2707d3de6473ad4 /source/blender/nodes | |
| parent | 4dce18fb51f17269161d1c2a16571502b97a860b (diff) | |
Cleanup: deduplicate image user initialization, make consistent.
Diffstat (limited to 'source/blender/nodes')
| -rw-r--r-- | source/blender/nodes/shader/nodes/node_shader_tex_environment.c | 4 | ||||
| -rw-r--r-- | source/blender/nodes/shader/nodes/node_shader_tex_image.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_environment.c b/source/blender/nodes/shader/nodes/node_shader_tex_environment.c index 6e8516b9886..0105bea9550 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_environment.c +++ b/source/blender/nodes/shader/nodes/node_shader_tex_environment.c @@ -48,9 +48,7 @@ static void node_shader_init_tex_environment(bNodeTree *UNUSED(ntree), bNode *no BKE_texture_colormapping_default(&tex->base.color_mapping); tex->color_space = SHD_COLORSPACE_COLOR; tex->projection = SHD_PROJ_EQUIRECTANGULAR; - tex->iuser.frames = 1; - tex->iuser.sfra = 1; - tex->iuser.ok = 1; + BKE_imageuser_default(&tex->iuser); node->storage = tex; } diff --git a/source/blender/nodes/shader/nodes/node_shader_tex_image.c b/source/blender/nodes/shader/nodes/node_shader_tex_image.c index 55e8e6a0e8f..37a9247c1cc 100644 --- a/source/blender/nodes/shader/nodes/node_shader_tex_image.c +++ b/source/blender/nodes/shader/nodes/node_shader_tex_image.c @@ -58,9 +58,7 @@ static void node_shader_init_tex_image(bNodeTree *UNUSED(ntree), bNode *node) BKE_texture_mapping_default(&tex->base.tex_mapping, TEXMAP_TYPE_POINT); BKE_texture_colormapping_default(&tex->base.color_mapping); tex->color_space = SHD_COLORSPACE_COLOR; - tex->iuser.frames = 1; - tex->iuser.sfra = 1; - tex->iuser.ok = 1; + BKE_imageuser_default(&tex->iuser); node->storage = tex; } |