Merged changes in the trunk up to revision 28685.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 9 May 2010 12:42:19 +0000 (12:42 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sun, 9 May 2010 12:42:19 +0000 (12:42 +0000)
commit1e30f000308debebf7cd5bbf6a9b37b8a94182de
treed6edeb35644fd1048d4b71d1f55ef1ab019bacef
parent8a20433f0fef5ab2d881d010cd5bd19fe484e555
parent80f6671dfe64ece1e692c8032e1d1169621bceff
Merged changes in the trunk up to revision 28685.
source/blender/blenloader/intern/readfile.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/freestyle/intern/stroke/Canvas.cpp
source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
source/blender/makesdna/DNA_scene_types.h
source/blender/render/intern/source/pipeline.c
source/creator/creator.c