Merging r46495 through r46557 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 11 May 2012 17:39:57 +0000 (17:39 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 11 May 2012 17:39:57 +0000 (17:39 +0000)
1  2 
source/blender/blenkernel/BKE_node.h
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/space_node/drawnode.c
source/blender/editors/transform/transform_conversions.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_nodetree.c
source/creator/CMakeLists.txt

Simple merge
Simple merge
Simple merge