Merging r38562 through r38614 from trunkinto soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 22 Jul 2011 16:58:22 +0000 (16:58 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 22 Jul 2011 16:58:22 +0000 (16:58 +0000)
commit22e08353e24d64fd7dbbc06257dafa73a97e11ee
tree0b443ad06c9240c2d49390c1dce551dcc2fb6b3e
parent478e42970cc4328bf68239ad27d56cf144f323b9
parentffc490cbf1d93c7e0a9b97953f6f52e69b9bc8ec
Merging r38562 through r38614 from trunkinto soc-2011-tomato
CMakeLists.txt
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/editors/space_node/drawnode.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_ops.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_scene.c