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)
1  2 
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

Simple merge
Simple merge