svn merge -r 22628:22714 https://svn.blender.org/svnroot/bf-blender/branches/blender2...
authorMatt Ebb <matt@mke3.net>
Sun, 23 Aug 2009 03:33:33 +0000 (03:33 +0000)
committerMatt Ebb <matt@mke3.net>
Sun, 23 Aug 2009 03:33:33 +0000 (03:33 +0000)
commitf5711909a6ec1278968859cc903a13da7a157073
tree2fd91724e9c864db3b6218c66346381224bfcf9c
parent46aac7b4fc5456daf8faabd7e6f2e65832c96268
parentf82ce68a9eda382fead176398b624f28b5c9945c
svn merge -r 22628:22714 https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/blender
release/ui/buttons_material.py
release/ui/buttons_texture.py
source/blender/blenkernel/intern/material.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/preview/previewrender.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_texture.c
source/blender/render/intern/source/texture.c