svn merge -r 16866:17042 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorDaniel Genrich <daniel.genrich@gmx.net>
Sun, 12 Oct 2008 12:17:57 +0000 (12:17 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Sun, 12 Oct 2008 12:17:57 +0000 (12:17 +0000)
commit2211b46084f4dc965f66649f01fcda69150225e8
tree02c438d2f6af568949dc9badaf266df2e84fa1c2
parent21075b1a17b901a104efd1a8cb47241947942ffd
parentf8d60578086e0405d56244b783d966c3d872b21a
svn merge -r 16866:17042 https://svn.blender.org/svnroot/bf-blender/trunk/blender
source/blender/blenloader/intern/readfile.c
source/blender/render/extern/include/RE_shader_ext.h
source/blender/render/intern/include/shading.h
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/rayshade.c
source/blender/render/intern/source/shadeinput.c
source/blender/src/buttons_shading.c