Merging r48545 through r48574 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 4 Jul 2012 07:33:34 +0000 (07:33 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 4 Jul 2012 07:33:34 +0000 (07:33 +0000)
commit17d7a9c3d976b08d0d080523685d8b985371c853
treee22e78802a6b882de4dec4e0d8f8a4bd35c2825d
parente505ab8ad29754405efe8eb0df75fb69944ce699
parentfacc2429ab1dc7741d3e795216a27063ac1192b7
Merging r48545 through r48574 from trunk into soc-2011-tomato
source/blender/blenkernel/BKE_mask.h
source/blender/blenkernel/intern/mask.c
source/blender/compositor/operations/COM_MaskOperation.cpp
source/blender/editors/space_node/space_node.c
source/blender/makesdna/DNA_windowmanager_types.h
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/render/intern/source/render_result.c
source/blender/windowmanager/intern/wm_window.c