From a0feea1fc07fb228c792d5bd20106508fbdb62e7 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 16 Feb 2012 04:08:52 +0000 Subject: 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. --- release/scripts/modules/bpy_extras/image_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'release/scripts/modules') 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 -- cgit v1.2.3