svn merge ^/trunk/blender -r49061:49063
authorCampbell Barton <ideasman42@gmail.com>
Thu, 19 Jul 2012 11:35:45 +0000 (11:35 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 19 Jul 2012 11:35:45 +0000 (11:35 +0000)
commit99c97e5aa3c1d46d9ffd0b7932aa5ea65c2c102c
treea35e05a06a1d6b638eb1718819ea81c8df959cd7
parent371e259a0b6fd7b0cea6542e9077b4f6bc84d39d
parenta56f4fee38e17d05964941a5edc2850c217309d7
svn merge ^/trunk/blender -r49061:49063
source/blender/editors/space_node/drawnode.c
source/blender/makesdna/DNA_node_types.h
source/blender/makesrna/intern/rna_nodetree.c