svn merge -r 17042:17201 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorDaniel Genrich <daniel.genrich@gmx.net>
Mon, 27 Oct 2008 20:14:45 +0000 (20:14 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Mon, 27 Oct 2008 20:14:45 +0000 (20:14 +0000)
1  2 
source/blender/blenloader/intern/readfile.c
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/shadeoutput.c
source/blender/src/buttons_shading.c

Simple merge