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)
commita3cd8c5c61131ed720d5098b5402518ee23c26b9
treef2e69d731ec03225170b97bbbd6d5fd4d08ec936
parentccf0b13fdc8c80cd24f6c68a6b4fbf44284a828d
parentb9378a3083b92a09e3afe8446bf2f087fad2db2b
svn merge ^/trunk/blender -r49478:49498
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