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)
commitca24daea64f1f0378d7a25e7d3d3d25022ece41d
tree470c192ca54d4016f2741bb4d09a835249593512
parent06fb9c85d4f37ed715e3cd3a1eeac5193da3d08d
parent7b3a5ead8c55d5284b143a169ac7402572f7e542
Merging r48224 through r48237 from trunk into soc-2011-tomato
source/blender/editors/space_node/drawnode.c
source/blender/makesrna/intern/rna_nodetree.c