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)
commit944dfa23c451464c72ffd82f6987490a47ff3b02
tree9ca3b7df7f3df21c5b403589262b8f73965f99e3
parent03b43a0db02028a0a41f0c141cd5ef1b661e5766
parent3123ad12a395031a1bf5a964582762a3831e9b1c
svn merge ^/trunk/blender -r43392:43420
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