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)
commitd4e74f21d12238b22a0ba631d813370ff2e699cc
tree5bc4c2f0a429b3ee6d1f2f3e5bbf85cdc9c54026
parentbcbd8c00c77694f47a40add5eda45ddc0abea585
parent28458168638e8fe5122bcf03ede5148fcdd3d271
svn merge ^/trunk/blender -r49947:49952
source/blender/editors/space_image/image_ops.c