Merging r48257 through r48263 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 25 Jun 2012 10:56:48 +0000 (10:56 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 25 Jun 2012 10:56:48 +0000 (10:56 +0000)
commitae063aae50eb7bb6fae632267dfeaef30c298782
tree7b464a8b84961cb331133acaa376039f63889124
parent6023c356e5ff27bcedfd5ecaf21f36efe3714fd6
parent1755a0ada6a16f41a492739edbfc6c9ff8e51bc6
Merging r48257 through r48263 from trunk into soc-2011-tomato
CMakeLists.txt
source/blender/editors/space_node/drawnode.c
source/blender/makesdna/DNA_node_types.h
source/blender/makesrna/intern/rna_nodetree.c