Merged changes in the trunk up to revision 36301.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 23 Apr 2011 22:08:18 +0000 (22:08 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 23 Apr 2011 22:08:18 +0000 (22:08 +0000)
commitbd860f89e75a10cae56be31f97fcd6aa9eb13b8e
tree4ad82db39475b754b9bb4c1c439033ce46e0c62e
parent2497af95a11122e6c30d42dd7bff5d8f239269ac
parent040a049fb17af2e690219ec7f48f601a6d2189c4
Merged changes in the trunk up to revision 36301.
24 files changed:
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/object.c
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/keyframes_edit.c
source/blender/editors/space_nla/nla_buttons.c
source/blender/editors/space_outliner/outliner.c
source/blender/editors/transform/transform.c
source/blender/makesdna/DNA_action_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/CMakeLists.txt
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_scene.c
source/blender/python/intern/bpy.c
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/shadeinput.c
source/creator/CMakeLists.txt
source/creator/creator.c