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)
commit919a84801549548f1dbfb619fdcac1befe234aeb
tree53cdf9b5c9d72623339bcc69da77e937bc9b1d1d
parent130b6bad4eea28b2906cc90cdb909c0b3a331f6a
parentdae8e9fbb2a19d35e5074e3ee161a3b3111792a0
svn merge ^/trunk/blender -r49107:49118
source/blender/blenkernel/intern/mask.c
source/blender/makesrna/intern/rna_scene.c