Merged changes in the trunk up to revision 52858.

Congratulations to all trunk devs on the Blender 2.65 release!
2012-12-10 23:34:41 +00:00
parent 5083e0737f 245345fba5
commit c9dc80111b
52 changed files with 518 additions and 338 deletions
--- a/release/scripts/startup/bl_operators/image.py
+++ b/release/scripts/startup/bl_operators/image.py
@@ -224,7 +224,7 @@ class ProjectApply(Operator):
        image_name = ProjectEdit._proj_hack[0]  # TODO, deal with this nicer

        try:
-            image = bpy.data.images[image_name]
+            image = bpy.data.images[image_name, None]
        except KeyError:
            import traceback
            traceback.print_exc()