svn merge ^/trunk/blender -r43392:43420
authorCampbell Barton <ideasman42@gmail.com>
Mon, 16 Jan 2012 11:50:17 +0000 (11:50 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 16 Jan 2012 11:50:17 +0000 (11:50 +0000)
1  2 
source/blender/blenloader/intern/readfile.c
source/blender/editors/object/object_ops.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/sculpt_paint/paint_utils.c
source/blender/editors/space_image/space_image.c