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)
commitfce87339750d50303f8b0324d88b517a10b76d52
treed8395eac2db6adb43470655fa257b2fa9ffc73f6
parent7db432d29dfa6610b2cce23a9769b232ac9ef02c
parent1f8291f78d6eb3e02414cc7801fe5ba9ad524e4b
Merged changes in the trunk up to revision 39896.
source/blender/editors/animation/anim_filter.c
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/shadeoutput.c