svn merge ^/trunk/blender -r49478:49498
authorCampbell Barton <ideasman42@gmail.com>
Thu, 2 Aug 2012 11:29:32 +0000 (11:29 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 2 Aug 2012 11:29:32 +0000 (11:29 +0000)
1  2 
release/scripts/startup/bl_ui/space_node.py
source/blender/blenkernel/BKE_node.h
source/blender/blenkernel/intern/node.c
source/blender/editors/space_node/node_intern.h

Simple merge