Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2010-06-06 01:19:59 +0400
committerCampbell Barton <ideasman42@gmail.com>2010-06-06 01:19:59 +0400
commit4da179749eb8d6b53f5c2eba4b3e4132656c3d4f (patch)
tree59b4dbfac1c894687f022efb72a9c010c93e555f /source/blender/blenkernel/intern/image.c
parentc12068920391c006cf5e72c1fafb4ebf8f807a55 (diff)
- [#22492] [29159] commit breaks importing of script file that has a reload to self in it
broke when including the blend path in the modules filename. - new function BLI_path_basename(), matches pythons os.path.basename(). replace a number of cases where BLI_split_dirfile was being used to get the filename only.
Diffstat (limited to 'source/blender/blenkernel/intern/image.c')
-rw-r--r--source/blender/blenkernel/intern/image.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c
index f860f579930..ef95139abda 100644
--- a/source/blender/blenkernel/intern/image.c
+++ b/source/blender/blenkernel/intern/image.c
@@ -440,10 +440,8 @@ Image *BKE_add_image_imbuf(ImBuf *ibuf)
{
/* on save, type is changed to FILE in editsima.c */
Image *ima;
- char filename[sizeof(ibuf->name)];
- BLI_split_dirfile(ibuf->name, NULL, filename);
- ima= image_alloc(filename, IMA_SRC_FILE, IMA_TYPE_IMAGE);
+ ima= image_alloc(BLI_path_basename(ibuf->name), IMA_SRC_FILE, IMA_TYPE_IMAGE);
if (ima) {
BLI_strncpy(ima->name, ibuf->name, FILE_MAX);