svn merge ^/trunk/blender -r49573:49601
authorCampbell Barton <ideasman42@gmail.com>
Mon, 6 Aug 2012 09:33:43 +0000 (09:33 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 6 Aug 2012 09:33:43 +0000 (09:33 +0000)
1  2 
source/blender/blenkernel/BKE_node.h
source/blender/blenkernel/intern/mask.c
source/blender/blenkernel/intern/node.c
source/blender/editors/space_node/drawnode.c
source/blender/editors/space_node/node_draw.c
source/blender/windowmanager/intern/wm_init_exit.c

Simple merge