svn merge ^/trunk/blender -r48961:48967
authorCampbell Barton <ideasman42@gmail.com>
Mon, 16 Jul 2012 13:13:27 +0000 (13:13 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 16 Jul 2012 13:13:27 +0000 (13:13 +0000)
commit7b3c9df572784d07c23e7c5add2e0aed1b481de8
tree90f4d67cdbf07d45631ff3e2ac2cb0bfaf808e46
parent4907f7c7e822b850a19b18a4bbe4f71413698d02
parent5b4a455569aab9557edff112ea1ffadc10a6738a
svn merge ^/trunk/blender -r48961:48967
source/blender/blenkernel/intern/mask.c