Merging r47740 through r47782 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 12 Jun 2012 11:41:06 +0000 (11:41 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 12 Jun 2012 11:41:06 +0000 (11:41 +0000)
commit331d7e569126be27a8d095fba9b01265dc78a0e5
treede3e90ad28cc57eaef8cf2330b68436a31a401f0
parent178feecfcd78fca71cecb11e7e1267a8d2f96750
parent552887251fa984cc7ff8e15aed59e82227d47c22
Merging r47740 through r47782 from trunk into soc-2011-tomato
source/blender/blenkernel/BKE_node.h
source/blender/blenkernel/intern/node.c
source/blender/makesrna/intern/rna_nodetree.c