Merging r48794 through r48802 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 10 Jul 2012 13:24:29 +0000 (13:24 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 10 Jul 2012 13:24:29 +0000 (13:24 +0000)
commitb8979b69c4c73f48657fefd9039c139ee9fbd070
treeab46c5d3f9fe638d030a9e5d41edb1dc28bf2924
parent276f07f40959e965d973a5b6b125df782dc354e0
parent165e8b0155ea14b2a3f45b843f1bc4e4e99ad42f
Merging r48794 through r48802 from trunk into soc-2011-tomato
source/blender/editors/space_node/node_draw.c
source/blender/makesdna/DNA_node_types.h