Merged changes in the trunk up to revision 34459.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 22 Jan 2011 23:38:28 +0000 (23:38 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 22 Jan 2011 23:38:28 +0000 (23:38 +0000)
commit50ced6b0176db8cf4d2393005be7f371ab9716de
tree0788a93e86b4b28c9338c74826aaab93547dbccb
parentc7a122aa27662a2fb528663ddd3dd652cdda2010
parentf39c794c7c3eca9c73ea0bdab084e6c191343965
Merged changes in the trunk up to revision 34459.
13 files changed:
source/blender/blenkernel/intern/object.c
source/blender/blenlib/intern/bpath.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/space_nla/nla_channels.c
source/blender/editors/space_outliner/outliner.c
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/DNA_action_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_internal.h
source/blender/python/intern/bpy.c
source/creator/creator.c