diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-05-05 18:52:04 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-05-05 18:52:04 +0400 |
| commit | 34b18fcbc18c6d89a1a1516d19c489994e4964dc (patch) | |
| tree | 2b53d4290e09ecb04762a1efc07d8553449faf11 /source/blender/blenkernel/BKE_image.h | |
| parent | 299ff91ea1fe5623bea1c6775cb8250d5e4ec3a0 (diff) | |
code cleanup: BKE_ naming, also make bpy.data.images.load() always load a new image. (not use existing one)
Diffstat (limited to 'source/blender/blenkernel/BKE_image.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_image.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/blenkernel/BKE_image.h b/source/blender/blenkernel/BKE_image.h index 637b57af0bc..d9a656a8a40 100644 --- a/source/blender/blenkernel/BKE_image.h +++ b/source/blender/blenkernel/BKE_image.h @@ -74,7 +74,7 @@ struct anim *openanim(const char *name, int flags, int streamindex); void image_de_interlace(struct Image *ima, int odd); -void make_local_image(struct Image *ima); +void BKE_image_make_local(struct Image *ima); void tag_image_time(struct Image *ima); void free_old_images(void); @@ -130,8 +130,10 @@ struct ImBuf *BKE_image_get_ibuf(struct Image *ima, struct ImageUser *iuser); struct ImBuf *BKE_image_acquire_ibuf(struct Image *ima, struct ImageUser *iuser, void **lock_r); void BKE_image_release_ibuf(struct Image *ima, void *lock); +/* returns a new image or NULL if it can't load */ +struct Image *BKE_image_load(const char *filepath); /* returns existing Image when filename/type is same (frame optional) */ -struct Image *BKE_add_image_file(const char *name); +struct Image *BKE_image_load_exists(const char *filepath); /* adds image, adds ibuf, generates color or pattern */ struct Image *BKE_add_image_size(unsigned int width, unsigned int height, const char *name, int depth, int floatbuf, short uvtestgrid, float color[4]); |