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/blenkernel | |
parent | 4dce18fb51f17269161d1c2a16571502b97a860b (diff) |
Cleanup: deduplicate image user initialization, make consistent.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_image.h | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/image.c | 17 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/texture.c | 4 |
3 files changed, 12 insertions, 10 deletions
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; } |