Merging r48985 through r48986 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 16 Jul 2012 20:36:09 +0000 (20:36 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 16 Jul 2012 20:36:09 +0000 (20:36 +0000)
commit1589454879e950ac0dbaf5784b3265a388842a3d
tree755ec1f24f64f71d8d60d54721faeef7b7b6f0d1
parent4a6a3e2f986fed8a2da1e98228d82554647b38d7
parent1f96470b5d80f05aef1dc1c262ba1a0a56a1d1fb
Merging r48985 through r48986 from trunk into soc-2011-tomato
source/blender/blenkernel/intern/mask.c