Merged changes in the trunk up to revision 33112.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Wed, 17 Nov 2010 00:58:03 +0000 (00:58 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Wed, 17 Nov 2010 00:58:03 +0000 (00:58 +0000)
commit09ba291c554a87cf1d94eb8213c89ddf75ee0389
tree4dd1e48d1f0bb1f1191bd647d0a6f97b2cb0385d
parenta95181a7a07c057fe757a2ec20391439ea671345
parent12afa64de98ccbfbf8ac2064dc537182b3d4cc81
Merged changes in the trunk up to revision 33112.
27 files changed:
release/scripts/ui/space_dopesheet.py
release/scripts/ui/space_userpref.py
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/BLI_bpath.h
source/blender/blenlib/intern/bpath.c
source/blender/blenloader/intern/readfile.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/include/ED_anim_api.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/space_outliner/outliner.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/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_scene.c
source/blender/python/intern/bpy.c
source/blender/render/extern/include/RE_pipeline.h
source/blender/render/intern/source/pipeline.c
source/creator/creator.c