Merged changes in the trunk up to revision 35972.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 3 Apr 2011 12:46:33 +0000 (12:46 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 3 Apr 2011 12:46:33 +0000 (12:46 +0000)
commit09c7d5aeb84443feabb5d8e03bf268cfe7a34acc
tree7c7f881ff2e2c0e065f25bb4b1b650f273f22da4
parent040f0a1096823926ab255fbb86b88363387b3148
parent5932cec2c6fa39a755f684b1e6de6a8a39072de6
Merged changes in the trunk up to revision 35972.
16 files changed:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/object.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/transform/transform.c
source/blender/makesdna/DNA_action_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/RNA_enum_types.h
source/blender/makesrna/intern/rna_action.c
source/blender/makesrna/intern/rna_scene.c
source/blender/python/SConscript
source/creator/CMakeLists.txt
source/creator/creator.c