svn merge -r 22450:22627 https://svn.blender.org/svnroot/bf-blender/branches/blender2...
authorMatt Ebb <matt@mke3.net>
Wed, 19 Aug 2009 11:18:52 +0000 (11:18 +0000)
committerMatt Ebb <matt@mke3.net>
Wed, 19 Aug 2009 11:18:52 +0000 (11:18 +0000)
commit132277f0989b0b7d99d883d22a2bade6534ae44c
tree6d26c46f62749470130375061381353fd54c2364
parent8480ea2b0abacae00c90d37e7d99fa5e0c89eebe
parente611c4756fa17c57855123dc2b5c2c2408b0d790
svn merge -r 22450:22627 https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/blender
18 files changed:
release/ui/buttons_material.py
release/ui/buttons_texture.py
source/blender/blenkernel/intern/material.c
source/blender/blenlib/intern/BLI_kdopbvh.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/preview/previewrender.c
source/blender/makesdna/DNA_material_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_material.c
source/blender/makesrna/intern/rna_texture.c
source/blender/render/CMakeLists.txt
source/blender/render/extern/include/RE_shader_ext.h
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/rayshade.c
source/blender/render/intern/source/shadeinput.c
source/blender/render/intern/source/shadeoutput.c
source/blender/render/intern/source/texture.c