Merging r39998 through r40043 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 8 Sep 2011 18:59:35 +0000 (18:59 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 8 Sep 2011 18:59:35 +0000 (18:59 +0000)
commit74ced9f2eaff79191e973549f94550c31ff12860
treee7d2e1dc4d24b6e406c2fd57abfa58fed69b61f5
parent13cbcc55451b16d84984523841402926c6351d0f
parentff0a452a8a49a9bcd5a3fd9f96e240425e267aa6
Merging r39998 through r40043 from trunk into soc-2011-tomato
CMakeLists.txt
release/datafiles/blenderbuttons
source/blender/blenkernel/intern/node.c
source/blender/collada/CameraExporter.cpp
source/blender/editors/datafiles/blenderbuttons.c
source/blender/editors/space_node/drawnode.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_userdef.c
source/blender/nodes/composite/node_composite_tree.c