Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T47986: OBJ Import fails w/ imagepath encoding

Browse Source
This commit is contained in:
Campbell Barton
2016-03-29 18:22:35 +11:00
parent b1f918bcc5
commit 2fae1719f8
2 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
release/scripts/modules/bpy_extras/image_utils.py
View File

@@ -80,9 +80,12 @@ def load_image(imagepath,
# Utility Functions
def _image_load_placeholder(path):
name = bpy.path.basename(path)
if type(name) == bytes:
name = name.decode("utf-8", "replace")
name = path
if type(path) is str:
name = name.encode("utf-8", "replace")
name = name.decode("utf-8", "replace")
name = os.path.basename(name)
image = bpy.data.images.new(name, 128, 128)
# allow the path to be resolved later
image.filepath = path
@@ -147,6 +150,8 @@ def load_image(imagepath,
# -------------------------------------------------------------------------
imagepath = bpy.path.native_pathsep(imagepath)
if verbose:
print("load_image('%s', '%s', ...)" % (imagepath, dirname))