svn merge ^/trunk/blender -r48375:48378
authorCampbell Barton <ideasman42@gmail.com>
Thu, 28 Jun 2012 15:41:44 +0000 (15:41 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 28 Jun 2012 15:41:44 +0000 (15:41 +0000)
commit1a2852cf1c485c97f2a6169ea23a4345ec457a5f
tree6e522ae00e52eaa598d456be1c291cfb6f0bddc3
parent420150f75224a9f0fc8d46e4f23dae5e4f0ad623
parentbee0f76f2631f6933829b077c9662012d9a00a38
svn merge ^/trunk/blender -r48375:48378
source/blender/blenkernel/intern/image.c