svn merge ^/trunk/blender -r48911:48927
authorCampbell Barton <ideasman42@gmail.com>
Sat, 14 Jul 2012 20:56:40 +0000 (20:56 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 14 Jul 2012 20:56:40 +0000 (20:56 +0000)
1  2 
release/scripts/startup/bl_ui/space_clip.py
source/blender/blenkernel/BKE_mask.h
source/blender/editors/space_node/drawnode.c
source/blender/editors/space_node/node_draw.c
source/blender/makesdna/DNA_mask_types.h

Simple merge