svn merge ^/trunk/blender -r47805:47873
authorCampbell Barton <ideasman42@gmail.com>
Thu, 14 Jun 2012 09:39:54 +0000 (09:39 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 14 Jun 2012 09:39:54 +0000 (09:39 +0000)
commit25d62203b54c4fa0b5116003a54be57187f9302f
treec1d73d3d1776bd2d87b7a5f9ae4b82309a0ee41d
parent7079709454d3b57174c4238a25d03bdb0f691df1
parentbccadfb33522b28b8bff8cf23a6bbb492ac50a82
svn merge ^/trunk/blender -r47805:47873
source/blender/blenkernel/BKE_node.h
source/blender/blenkernel/intern/node.c
source/blender/compositor/CMakeLists.txt
source/blender/editors/space_node/drawnode.c
source/blender/makesrna/intern/rna_nodetree.c