svn merge ^/trunk/blender -r48986:48991
authorCampbell Barton <ideasman42@gmail.com>
Tue, 17 Jul 2012 09:58:20 +0000 (09:58 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 17 Jul 2012 09:58:20 +0000 (09:58 +0000)
1  2 
source/blender/blenkernel/BKE_mask.h
source/blender/blenkernel/intern/mask.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/screen/screen_ops.c

Simple merge