diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-05-04 05:25:33 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-05-04 09:01:20 +0300 |
| commit | fdc5f9c0a81bba0be6bab5120cdfc955d63265d5 (patch) | |
| tree | a1c0f16847e59d5257f6104dd646ebe083da02c7 /source/blender/blenkernel/intern/image.c | |
| parent | 4e7ef3f5cd8cd96545c3250a93bf856174ee54e2 (diff) | |
Add name argument to data creation API calls
Was adding then renaming, unnecessarily.
Diffstat (limited to 'source/blender/blenkernel/intern/image.c')
| -rw-r--r-- | source/blender/blenkernel/intern/image.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index eceb5c4ff20..b714e8b7eac 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -883,12 +883,16 @@ Image *BKE_image_add_generated(Main *bmain, unsigned int width, unsigned int hei /* Create an image image from ibuf. The refcount of ibuf is increased, * caller should take care to drop its reference by calling * IMB_freeImBuf if needed. */ -Image *BKE_image_add_from_imbuf(ImBuf *ibuf) +Image *BKE_image_add_from_imbuf(ImBuf *ibuf, const char *name) { /* on save, type is changed to FILE in editsima.c */ Image *ima; - ima = image_alloc(G.main, BLI_path_basename(ibuf->name), IMA_SRC_FILE, IMA_TYPE_IMAGE); + if (name == NULL) { + name = BLI_path_basename(ibuf->name); + } + + ima = image_alloc(G.main, name, IMA_SRC_FILE, IMA_TYPE_IMAGE); if (ima) { BLI_strncpy(ima->name, ibuf->name, FILE_MAX); |