Merging r47535 through r47566 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 7 Jun 2012 09:32:39 +0000 (09:32 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 7 Jun 2012 09:32:39 +0000 (09:32 +0000)
commit4ac1e1b222afa4da813c6142672ed1526e91cdc0
tree295480a5ba32d36f88add698036236ce578d09a5
parent286c5915b35f3008030cd89899be0d714bd30ada
parenta99b9a5c3d6eb567092dcfb005a540564b5b8ebd
Merging r47535 through r47566 from trunk into soc-2011-tomato
source/blender/blenkernel/BKE_node.h
source/blender/blenloader/intern/readfile.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_conversions.c
source/blender/editors/transform/transform_ops.c
source/blenderplayer/CMakeLists.txt