svn merge -r 17201:17502 https://svn.blender.org/svnroot/bf-blender/trunk/blender
authorDaniel Genrich <daniel.genrich@gmx.net>
Wed, 19 Nov 2008 19:28:12 +0000 (19:28 +0000)
committerDaniel Genrich <daniel.genrich@gmx.net>
Wed, 19 Nov 2008 19:28:12 +0000 (19:28 +0000)
commit28da9ad12ee9ab22432401a5c9cd485df971323a
treeae0a5773a38df61531beac365530acb037fa6a9f
parent14a0718a8a4ed3ee95f6374e20dbe9e74cf3b5c6
parentf8e56e96bf2be4580dd34c33c6379339642638f0
svn merge -r 17201:17502 https://svn.blender.org/svnroot/bf-blender/trunk/blender
17 files changed:
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/texture.c
source/blender/blenlib/BLI_arithb.h
source/blender/blenlib/intern/arithb.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/makesdna/DNA_texture_types.h
source/blender/render/extern/include/RE_shader_ext.h
source/blender/render/intern/include/texture.h
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/rayshade.c
source/blender/render/intern/source/texture.c
source/blender/render/intern/source/volumetric.c
source/blender/src/butspace.c
source/blender/src/buttons_object.c
source/blender/src/buttons_shading.c
source/blender/src/drawnode.c