svn merge ^/trunk/blender -r49947:49952
authorCampbell Barton <ideasman42@gmail.com>
Fri, 17 Aug 2012 13:04:23 +0000 (13:04 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 17 Aug 2012 13:04:23 +0000 (13:04 +0000)
1  2 
source/blender/editors/space_image/image_ops.c