svn merge -r 16667:16741 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorDaniel Genrich <daniel.genrich@gmx.net>
Fri, 26 Sep 2008 08:58:15 +0000 (08:58 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Fri, 26 Sep 2008 08:58:15 +0000 (08:58 +0000)
commitc301a059bd59672daf022755181f114ce70a21e9
tree3819a1a1a6f647a1def1279bcd293df8b34d2534
parent5adff90b0868f88050e601092b35628fa3ae132b
parent06a5e9b58a0c1281609ee1ddb850fc058fe56c4f
svn merge -r 16667:16741 https://svn.blender.org/svnroot/bf-blender/trunk/blender
source/blender/blenloader/intern/readfile.c
source/blender/render/intern/source/shadeinput.c
source/blender/src/buttons_shading.c