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)
commit258784ae4b756f1e86c272dbbee8adc1e5c7da51
tree3c2cf2d2ec629c9917cb7c2368f3cd3256111693
parentdeea0fa2e70a094cd289ac0083dcbf624453df51
parent2e96728843d01fa0e8c79133b0e7f943930405de
svn merge -r 17042:17201 https://svn.blender.org/svnroot/bf-blender/trunk/blender
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