diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-02-16 11:11:50 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-02-16 11:11:50 +0400 |
| commit | b5628b45ff8535941887b0703e13bb21fc62260f (patch) | |
| tree | 4bb3c767e81c87af1368274104535ce216ca2d6a /release | |
| parent | 9251d64e2b6bbcdbe051f4c99cdb2e5a2071509a (diff) | |
| parent | 30dddb9840e1566e50c5aacc70bd4b2865c7fa56 (diff) | |
Merging r44129 through r44139 from trunk into soc-2011-tomato
Diffstat (limited to 'release')
| -rw-r--r-- | release/datafiles/splash.png | bin | 109531 -> 110338 bytes | |||
| -rw-r--r-- | release/scripts/modules/bpy_extras/image_utils.py | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/release/datafiles/splash.png b/release/datafiles/splash.png Binary files differindex a5a16fd60cc..01d8b195317 100644 --- a/release/datafiles/splash.png +++ b/release/datafiles/splash.png 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 |
