Merged changes in the trunk up to revision 41099.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Tue, 18 Oct 2011 23:36:43 +0000 (23:36 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Tue, 18 Oct 2011 23:36:43 +0000 (23:36 +0000)
commitb4e7451cb0547ede96922ae97ee440f17e452332
tree1a7611802576089e5c47a4062d386156499d63ce
parentb53505f5e11771b2e500fb9f812a4cd649a5d715
parentdc907ef876b128c9767394d00dfc719d55ba077e
Merged changes in the trunk up to revision 41099.
23 files changed:
build_files/scons/tools/Blender.py
doc/python_api/sphinx_doc_gen.py
release/datafiles/splash.png
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/material.c
source/blender/blenlib/intern/bpath.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/datafiles/splash.png.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/render/render_shading.c
source/blender/editors/space_file/filelist.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/transform/transform.c
source/blender/makesdna/DNA_action_types.h
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/python/intern/bpy.c
source/creator/CMakeLists.txt