Merged changes in the trunk up to revision 27752.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Thu, 25 Mar 2010 21:40:08 +0000 (21:40 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Thu, 25 Mar 2010 21:40:08 +0000 (21:40 +0000)
commit048f357f416d8044a3acfb16f7cd27db194cd3e8
tree65c5da02a9e39518550d89e72a4b5c69fa9089e8
parent29adfa7d649df33a3d756b02058b4c1b09740058
parentaa3428e6abbf3ef453757b4909ad10bb52b9a418
Merged changes in the trunk up to revision 27752.
16 files changed:
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/render/render_ops.c
source/blender/editors/render/render_shading.c
source/blender/editors/space_outliner/outliner.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_orientations.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.c
source/blender/render/intern/source/pipeline.c
source/creator/creator.c