[Bf-blender-cvs] [0a4cded91ee] master: Cleanup: deduplicate image user initialization, make consistent.

[Brecht Van Lommel]

Commit: 0a4cded91eeda7a08611d9f894ce29086663bfa8
Author: Brecht Van Lommel
Date:   Sat Feb 20 22:36:02 2016 +0100
Branches: master
https://developer.blender.org/rB0a4cded91eeda7a08611d9f894ce29086663bfa8

Cleanup: deduplicate image user initialization, make consistent.

===================================================================

M	source/blender/blenkernel/BKE_image.h
M	source/blender/blenkernel/intern/image.c
M	source/blender/blenkernel/intern/texture.c
M	source/blender/editors/space_image/space_image.c
M	source/blender/nodes/shader/nodes/node_shader_tex_environment.c
M	source/blender/nodes/shader/nodes/node_shader_tex_image.c

===================================================================

diff --git a/source/blender/blenkernel/BKE_image.h b/source/blender/blenkernel/BKE_image.h
index 4d3ad17519e..7a806796527 100644
--- a/source/blender/blenkernel/BKE_image.h
+++ b/source/blender/blenkernel/BKE_image.h
@@ -233,6 +233,7 @@ struct Image *BKE_image_add_generated(struct Main *bmain,
 struct Image *BKE_image_add_from_imbuf(struct Main *bmain, struct ImBuf *ibuf, const char *name);
 
 /* for reload, refresh, pack */
+void BKE_imageuser_default(struct ImageUser *iuser);
 void BKE_image_init_imageuser(struct Image *ima, struct ImageUser *iuser);
 void BKE_image_signal(struct Main *bmain, struct Image *ima, struct ImageUser *iuser, int signal);
 
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index 75807ebbfa3..75df0fa6aaa 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -3029,7 +3029,15 @@ static void image_tag_reload(Image *ima, ImageUser *iuser, void *customdata)
   }
 }
 
-static void image_init_imageuser(Image *ima, ImageUser *iuser)
+void BKE_imageuser_default(ImageUser *iuser)
+{
+  memset(iuser, 0, sizeof(ImageUser));
+  iuser->ok = true;
+  iuser->frames = 100;
+  iuser->sfra = 1;
+}
+
+void BKE_image_init_imageuser(Image *ima, ImageUser *iuser)
 {
   RenderResult *rr = ima->rr;
 
@@ -3040,11 +3048,6 @@ static void image_init_imageuser(Image *ima, ImageUser *iuser)
     BKE_image_multilayer_index(rr, iuser);
 }
 
-void BKE_image_init_imageuser(Image *ima, ImageUser *iuser)
-{
-  image_init_imageuser(ima, iuser);
-}
-
 void BKE_image_signal(Main *bmain, Image *ima, ImageUser *iuser, int signal)
 {
   if (ima == NULL)
@@ -3146,7 +3149,7 @@ void BKE_image_signal(Main *bmain, Image *ima, ImageUser *iuser, int signal)
         iuser->ok = 1;
         if (ima->source == IMA_SRC_FILE || ima->source == IMA_SRC_SEQUENCE) {
           if (ima->type == IMA_TYPE_MULTILAYER) {
-            image_init_imageuser(ima, iuser);
+            BKE_image_init_imageuser(ima, iuser);
           }
         }
       }
diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c
index dbbb231a18b..d225baebaaf 100644
--- a/source/blender/blenkernel/intern/texture.c
+++ b/source/blender/blenkernel/intern/texture.c
@@ -254,9 +254,7 @@ void BKE_texture_default(Tex *tex)
   tex->vn_distm = 0;
   tex->vn_coltype = 0;
 
-  tex->iuser.ok = 1;
-  tex->iuser.frames = 100;
-  tex->iuser.sfra = 1;
+  BKE_imageuser_default(&tex->iuser);
 
   tex->preview = NULL;
 }
diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c
index 3160e419393..f3ed84b3277 100644
--- a/source/blender/editors/space_image/space_image.c
+++ b/source/blender/editors/space_image/space_image.c
@@ -188,8 +188,7 @@ static SpaceLink *image_new(const ScrArea *UNUSED(area), const Scene *UNUSED(sce
   simage->lock = true;
   simage->flag = SI_SHOW_GPENCIL | SI_USE_ALPHA | SI_COORDFLOATS;
 
-  simage->iuser.ok = true;
-  simage->iuser.frames = 100;
+  BKE_imageuser_default(&simage->iuser);
   simage->iuser.flag = IMA_SHOW_STEREO | IMA_ANIM_ALWAYS;
 
   scopes_new(&simage->scopes);
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;
 }