diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-17 19:51:48 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-17 19:51:48 +0400 |
| commit | 4c66e696fbcaefe40f0394fea8fc4a55bb7d6994 (patch) | |
| tree | e8f60920e276ec1fec3c8014b77790a6c790deba /release/scripts/modules | |
| parent | 02987fd5e1fa3715d25bb7b9bd659fd509f40c57 (diff) | |
| parent | b7f3887a3a8a66aeba3a16ae5d76b934af3ccc7c (diff) | |
svn merge ^/trunk/blender -r44136:44189
Diffstat (limited to 'release/scripts/modules')
| -rw-r--r-- | release/scripts/modules/bpy_extras/image_utils.py | 2 |
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 |