Merging trunk into soc-2011-tomato up to revision 40540
authorSergey Sharybin <sergey.vfx@gmail.com>
Sun, 25 Sep 2011 20:03:03 +0000 (20:03 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sun, 25 Sep 2011 20:03:03 +0000 (20:03 +0000)
commitae8c7c6b10b157e26c7131ccef0524556b3d0731
treeaaee2b38075cf6c3882607d8dd8dc7e230fa874f
parent8854d50c195116db44a318cf515b3c67e75ce335
parenta932f93098ae64edbfd79ff3debe9712a55f2421
Merging trunk into soc-2011-tomato up to revision 40540
16 files changed:
CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/editors/screen/area.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/editors/transform/transform.h
source/blender/editors/transform/transform_conversions.c
source/blender/imbuf/intern/indexer.c
source/blender/makesdna/DNA_constraint_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/render/intern/source/envmap.c
source/creator/creator.c
source/gameengine/Converter/BL_BlenderDataConversion.cpp
source/gameengine/Ketsji/KX_KetsjiEngine.cpp