Merged changes in the trunk up to revision 33348.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 27 Nov 2010 12:48:35 +0000 (12:48 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 27 Nov 2010 12:48:35 +0000 (12:48 +0000)
commita04603d2a0ffed1b3030167449687b893711da32
tree95a529f8fb0914add4ea596962b11d6be2f31573
parent5c26fd6c4cd3e05c70b5473cc045127b615a592d
parent02cc80691d71ea305780655d3b0d4cd4530db9c7
Merged changes in the trunk up to revision 33348.
32 files changed:
doc/python_api/sphinx_doc_gen.py
release/scripts/ui/space_userpref.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/scene.c
source/blender/blenlib/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/render/CMakeLists.txt
source/blender/editors/space_outliner/outliner.c
source/blender/editors/transform/transform.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/RNA_enum_types.h
source/blender/makesrna/RNA_types.h
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_action.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_scene.c
source/blender/python/intern/CMakeLists.txt
source/blender/render/CMakeLists.txt
source/blender/render/extern/include/RE_pipeline.h
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/shadeoutput.c
source/creator/CMakeLists.txt
source/creator/creator.c