Merging r50119 through r50132 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 22 Aug 2012 17:23:02 +0000 (17:23 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 22 Aug 2012 17:23:02 +0000 (17:23 +0000)
1  2 
source/blender/editors/space_node/drawnode.c
source/blender/editors/space_node/node_draw.c
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_sequencer.c