Merging r49281 through r49286 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 27 Jul 2012 11:07:55 +0000 (11:07 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 27 Jul 2012 11:07:55 +0000 (11:07 +0000)
1  2 
source/blender/blenkernel/BKE_mask.h
source/blender/blenkernel/intern/mask.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_node/drawnode.c
source/blender/makesrna/intern/rna_nodetree.c
source/blender/windowmanager/intern/wm_init_exit.c

Simple merge