Merging r38454 through r38515 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 19 Jul 2011 19:58:01 +0000 (19:58 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 19 Jul 2011 19:58:01 +0000 (19:58 +0000)
1  2 
source/blender/blenloader/intern/readfile.c
source/blender/makesdna/DNA_scene_types.h
source/blender/windowmanager/intern/wm_operators.c
source/gameengine/Converter/BL_BlenderDataConversion.cpp