Merged changes in the trunk up to revision 36757.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Thu, 19 May 2011 01:40:37 +0000 (01:40 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Thu, 19 May 2011 01:40:37 +0000 (01:40 +0000)
commitdfcd01553536d63dab1037d0ea289b9d9d90c39c
tree089cf7b605457c8d565f1e1a3c82558210c5e87d
parent31471f644cb9d9c3b88da1977705724649482a82
parentc04f9b779c4384f3cc6961b2ed54456bdab14f43
Merged changes in the trunk up to revision 36757.
23 files changed:
source/blender/CMakeLists.txt
source/blender/SConscript
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
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/interface/interface_templates.c
source/blender/editors/render/CMakeLists.txt
source/blender/editors/transform/transform.c
source/blender/makesdna/DNA_ID.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/SConscript
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_color.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_scene.c
source/blender/render/extern/include/RE_pipeline.h
source/creator/CMakeLists.txt
source/creator/creator.c