Revision: 44138
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44138
Author: campbellbarton
Date: 2012-02-16 04:08:52 +0000 (Thu, 16 Feb 2012)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/blender/release/scripts/modules/bpy_extras/image_utils.py
Modified: trunk/blender/release/scripts/modules/bpy_extras/image_utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_extras/image_utils.py
2012-02-15 18:32:08 UTC (rev 44137)
+++ trunk/blender/release/scripts/modules/bpy_extras/image_utils.py
2012-02-16 04:08:52 UTC (rev 44138)
@@ -97,7 +97,7 @@
# 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
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
