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)
1  2 
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

Simple merge