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)
commit77610e155019d11274be8f64428878d78f73ec20
treea2c3f9ce23c71bae5dc4c8ccc3fb05b047172bf6
parent1ba78bca9487c7f9fe5404d782a34c5abd118db0
parent3b743582ec282cfffc84c5e235f58fe2745327c9
svn merge ^/trunk/blender -r49573:49601
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