Merged changes in the trunk up to revision 40299.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 17 Sep 2011 18:54:16 +0000 (18:54 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 17 Sep 2011 18:54:16 +0000 (18:54 +0000)
commit70821c6b24f19acd7263fadf161b94611b53273f
treea662f3a9b1dc2db824699888acb7cedf6749eb89
parentf24255b5a03f68a2ef4e09eb55d93dc21a1f44c0
parente53c4dae546f9550d6a4e79ae87c3dee9ac7b650
Merged changes in the trunk up to revision 40299.
20 files changed:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/object.c
source/blender/blenlib/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/render/render_shading.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_orientations.c
source/blender/makesdna/DNA_action_types.h
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_action.c
source/blender/makesrna/intern/rna_scene.c
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/shadeinput.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/CMakeLists.txt
source/creator/creator.c