diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-07-20 12:10:01 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-07-20 12:10:01 +0400 |
commit | 4ad43aaf16951ff3b916497509b1499734f38d0b (patch) | |
tree | d05da42f5cdc98ae7daa5e818ca2a0ba760ae3a8 /release/scripts/modules/bpy_extras/image_utils.py | |
parent | 8b5e7f26501ba1794ad4e556fae169b2ca3c8769 (diff) |
added bpy.path.basename because "//" prefix breaks os.path.basename.
Diffstat (limited to 'release/scripts/modules/bpy_extras/image_utils.py')
-rw-r--r-- | release/scripts/modules/bpy_extras/image_utils.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/release/scripts/modules/bpy_extras/image_utils.py b/release/scripts/modules/bpy_extras/image_utils.py index f91535a0ad4..e56c1c651c4 100644 --- a/release/scripts/modules/bpy_extras/image_utils.py +++ b/release/scripts/modules/bpy_extras/image_utils.py @@ -86,7 +86,9 @@ def load_image(imagepath, variants = [imagepath] if dirname: - variants += [os.path.join(dirname, imagepath), os.path.join(dirname, os.path.basename(imagepath))] + variants += [os.path.join(dirname, imagepath), + os.path.join(dirname, bpy.path.basename(imagepath)), + ] for filepath_test in variants: if ncase_cmp: @@ -99,7 +101,7 @@ def load_image(imagepath, return _image_load(nfilepath) if place_holder: - image = bpy.data.images.new(os.path.basename(imagepath), 128, 128) + image = bpy.data.images.new(bpy.path.basename(imagepath), 128, 128) # allow the path to be resolved later image.filepath = imagepath return image |