svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22717:22875
authorCampbell Barton <ideasman42@gmail.com>
Sat, 29 Aug 2009 23:41:09 +0000 (23:41 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 29 Aug 2009 23:41:09 +0000 (23:41 +0000)
commit75697c40a039e8f64573bedd5211c442e2af9e9c
treeaf111682037c4568eec377984005928046d867b6
parentc2696ae63182da338d69a5127f03b1ad8b88f6c9
parentd7bf9688ac78169a37fbfc0d3d5bcd5b5be19170
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22717:22875
release/ui/space_userpref.py
source/blender/editors/object/object_edit.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_userdef.c
source/blender/render/intern/source/rayshade.c
source/blender/render/intern/source/rendercore.c
source/gameengine/Converter/BL_BlenderDataConversion.cpp
source/gameengine/Ketsji/KX_GameObject.cpp
source/gameengine/Ketsji/KX_PythonInit.cpp
source/gameengine/PyDoc/GameLogic.py