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)
commitb9c6a203547928d6e5cbaac4dd0ddbb1f25e8a34
treeaa01912d16496a92b2ec5a9efc79de421c2139a3
parent58ac2dbed66feda32a6ec9eaa0e3887771176b28
parentfd7825e7dce2803c7864303d5346027d60d212ee
Merging r38454 through r38515 from trunk into soc-2011-tomato
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