Merged changes in the trunk up to revision 34335.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 15 Jan 2011 23:09:52 +0000 (23:09 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 15 Jan 2011 23:09:52 +0000 (23:09 +0000)
commitc7a122aa27662a2fb528663ddd3dd652cdda2010
treea014a8601c20ccd4d48dd82e9b0f88245b4beddd
parentbc1e26e4965877533902aa5d0e51537deeb319c4
parent86bbab7de53b07ad9a45b11dbff6bd5c0ee40c14
Merged changes in the trunk up to revision 34335.
25 files changed:
release/scripts/ui/properties_render.py
release/scripts/ui/space_dopesheet.py
release/scripts/ui/space_userpref.py
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/animation/keyframes_draw.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/render/render_shading.c
source/blender/editors/space_nla/nla_channels.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_orientations.c
source/blender/makesdna/DNA_action_types.h
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/intern/makesrna.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_action.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_scene.c