svn merge -r 22423:22450 https://svn.blender.org/svnroot/bf-blender/branches/blender2...
authorMatt Ebb <matt@mke3.net>
Sat, 15 Aug 2009 07:40:22 +0000 (07:40 +0000)
committerMatt Ebb <matt@mke3.net>
Sat, 15 Aug 2009 07:40:22 +0000 (07:40 +0000)
commit34dc95f7eefece0839d1f2ee15585a8f6d9066a5
treeb98cdb1e975089c60dc0bf14fc517c09612c910e
parent5a21bc578cc392b9f21ee5355f4062075f45f907
parent4bbccd39bc827e5d794bdbe987b4d48164e8d950
svn merge -r 22423:22450 https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/blender
release/ui/buttons_texture.py
source/blender/makesdna/DNA_texture_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_texture.c