Merged changes in the trunk up to revision 26083.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Mon, 18 Jan 2010 20:01:58 +0000 (20:01 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Mon, 18 Jan 2010 20:01:58 +0000 (20:01 +0000)
13 files changed:
1  2 
source/blender/blenloader/intern/readfile.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/transform/transform.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_scene.c
source/blender/python/intern/bpy_interface.c
source/blender/render/intern/source/pipeline.c
source/creator/CMakeLists.txt
source/creator/SConscript
source/creator/creator.c

Simple merge
Simple merge
Simple merge
Simple merge