svn merge ^/trunk/blender -r48967:48970
authorCampbell Barton <ideasman42@gmail.com>
Mon, 16 Jul 2012 14:29:23 +0000 (14:29 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 16 Jul 2012 14:29:23 +0000 (14:29 +0000)
commit11276bca5ce431981ceded2ef10d4b2acdad88ad
treeaeb8a6fa455f40dd15e7191530fae458cf46e69b
parent7b3c9df572784d07c23e7c5add2e0aed1b481de8
parent13b56dec782e7b492fed2107eb4db0736e93d10f
svn merge ^/trunk/blender -r48967:48970
source/blender/blenkernel/BKE_mask.h
source/blender/blenkernel/intern/mask.c
source/blender/editors/interface/interface_templates.c