svn merge ^/trunk/blender -r49107:49118
authorCampbell Barton <ideasman42@gmail.com>
Sun, 22 Jul 2012 16:10:06 +0000 (16:10 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 22 Jul 2012 16:10:06 +0000 (16:10 +0000)
1  2 
source/blender/blenkernel/intern/mask.c
source/blender/makesrna/intern/rna_scene.c