Merging r47307 through r47325 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 1 Jun 2012 14:08:18 +0000 (14:08 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 1 Jun 2012 14:08:18 +0000 (14:08 +0000)
commitc9aa6cf80d0fce67ace4e2e43c5a39dc3cc4477f
treee3a8ddb0181b4cbed89e89e90604fb04a3064c98
parent1691414d44402c2730334a215c11e64351873967
parent4fc4aa383b71a7d0a86eef29fd7ffa0383893f52
Merging r47307 through r47325 from trunk into soc-2011-tomato
source/blender/blenkernel/BKE_node.h
source/blender/blenkernel/intern/node.c
source/blender/compositor/CMakeLists.txt
source/blender/editors/space_node/drawnode.c
source/blender/nodes/composite/node_composite_tree.c
source/blender/windowmanager/intern/wm_operators.c