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>2012-02-16 08:08:52 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-02-16 08:08:52 +0400
commita0feea1fc07fb228c792d5bd20106508fbdb62e7 (patch)
treebfb4d9b45ad2b2b43bd104e676f46ac2c10fa7c9
parent93526b4c72f76f8d8d382a11e7d0f8e4f21c4a7c (diff)
fix [#30201] bpy_extras.image_utils.load_image always returns placeholder
in existing addons this only effects OBJ import. interestingly even though this is a bug (in that its returning a placeholder when it should load the image), since the placeholder points to the correct path, the image will load correctly when refreshed, so the bug's not too bad.
-rw-r--r--release/scripts/modules/bpy_extras/image_utils.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/release/scripts/modules/bpy_extras/image_utils.py b/release/scripts/modules/bpy_extras/image_utils.py
index 7d409510c85..c21b750fd1f 100644
--- a/release/scripts/modules/bpy_extras/image_utils.py
+++ b/release/scripts/modules/bpy_extras/image_utils.py
@@ -97,7 +97,7 @@ def load_image(imagepath,
# image path has been checked so the path could not be read for some
# reason, so be sure to return a placeholder
- if place_holder:
+ if place_holder and image is None:
image = _image_load_placeholder(path)
return image