svn merge ^/trunk/blender -r47150:47184
authorCampbell Barton <ideasman42@gmail.com>
Tue, 29 May 2012 15:02:21 +0000 (15:02 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 29 May 2012 15:02:21 +0000 (15:02 +0000)
commit7d04e4c53e5cd4888afd4177a9d70a6fc72c8e36
tree9877850d4e9b86a36f787f2f730668617b42a1b4
parentec4f6750557218be262cacea53ef4cb0ccaa0671
parentfeb3dc926a74b51789b100ac9532dc196a4cd9ae
svn merge ^/trunk/blender -r47150:47184
14 files changed:
source/blender/CMakeLists.txt
source/blender/blenkernel/BKE_node.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/node.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/space_node/drawnode.c
source/blender/editors/space_node/space_node.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_nodetree.c
source/blender/nodes/CMakeLists.txt
source/blenderplayer/CMakeLists.txt
source/creator/CMakeLists.txt