diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-12 10:15:49 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-12 10:15:49 +0300 |
| commit | 99bb1accbbb8e1ba38f30b073b22deb107bf3220 (patch) | |
| tree | 7852ec686524e785486c452ec959713abbbef666 /source/blender/blenkernel/BKE_image.h | |
| parent | 732cd96737007b1411a161369f842209a4c26419 (diff) | |
| parent | b8f217ef213f908a6b5407f162a8f980091e838d (diff) | |
Merge branch 'master' into asset-experiments
Conflicts:
source/blender/blenloader/intern/readfile.c
source/blender/windowmanager/intern/wm_init_exit.c
Diffstat (limited to 'source/blender/blenkernel/BKE_image.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_image.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_image.h b/source/blender/blenkernel/BKE_image.h index eb98268c9f0..0895feef983 100644 --- a/source/blender/blenkernel/BKE_image.h +++ b/source/blender/blenkernel/BKE_image.h @@ -108,7 +108,7 @@ struct anim *openanim_noload(const char *name, int flags, int streamindex, char void BKE_image_de_interlace(struct Image *ima, int odd); -void BKE_image_make_local(struct Image *ima); +void BKE_image_make_local(struct Main *bmain, struct Image *ima); void BKE_image_tag_time(struct Image *ima); |