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)
1  2 
source/blender/blenkernel/BKE_mask.h
source/blender/blenkernel/intern/mask.c
source/blender/editors/interface/interface_templates.c

Simple merge