Merged changes in the trunk up to revision 34010.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 2 Jan 2011 18:34:32 +0000 (18:34 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 2 Jan 2011 18:34:32 +0000 (18:34 +0000)
commitddcb91fc213cb9d9f87558f88a4831cd4c8e2791
treeb3a266754610fff89abadfc3971721f432f2001f
parent3ead3c4ff3a438202a9838843ed4000b26de62a7
parentfe44c6596d6de906f1534f139b980e6d0a205bac
Merged changes in the trunk up to revision 34010.
16 files changed:
release/scripts/ui/properties_render.py
release/scripts/ui/space_dopesheet.py
release/scripts/ui/space_userpref.py
source/blender/blenkernel/BKE_main.h
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/animation/keyframes_draw.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/space_outliner/outliner.c
source/blender/makesrna/RNA_types.h
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_scene.c
source/blender/python/intern/CMakeLists.txt
source/blender/render/intern/source/pipeline.c