Merging r48224 through r48237 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Sun, 24 Jun 2012 14:27:23 +0000 (14:27 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sun, 24 Jun 2012 14:27:23 +0000 (14:27 +0000)
1  2 
source/blender/editors/space_node/drawnode.c
source/blender/makesrna/intern/rna_nodetree.c