Merged changes in the trunk up to revision 39896.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 3 Sep 2011 21:30:40 +0000 (21:30 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Sat, 3 Sep 2011 21:30:40 +0000 (21:30 +0000)
1  2 
source/blender/editors/animation/anim_filter.c
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/shadeoutput.c