svn merge -r 16592:16667 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorDaniel Genrich <daniel.genrich@gmx.net>
Mon, 22 Sep 2008 10:04:45 +0000 (10:04 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Mon, 22 Sep 2008 10:04:45 +0000 (10:04 +0000)
commitc08acde589e9ab925c35145597c34c45f594e7c9
treeb1518a562776afc8d2daf226abdcd7c94d8c4594
parent7522f86d010e600e17e82f98364235e96df21c1e
parentd1dedb2cef4bf1dc2fd9b563dee7c1f45b79c173
svn merge -r 16592:16667 https://svn.blender.org/svnroot/bf-blender/trunk/blender
source/blender/blenlib/BLI_arithb.h
source/blender/blenlib/intern/arithb.c
source/blender/blenloader/intern/readfile.c
source/blender/makesdna/DNA_material_types.h
source/blender/render/intern/include/texture.h
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/shadeoutput.c
source/blender/render/intern/source/texture.c
source/blender/src/buttons_shading.c
source/blender/src/previewrender.c