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)
commit43fede95199399c79704ade56f9b6a4335b21946
tree519e800f2f3a3064999c523ae15e40a825338674
parent1589454879e950ac0dbaf5784b3265a388842a3d
parentf4cff34392a8efe7cc7be448ccd9fa2386597772
svn merge ^/trunk/blender -r48986:48991
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