diff options
author | Nicholas Bishop <nicholasbishop@gmail.com> | 2010-06-29 20:55:04 +0400 |
---|---|---|
committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2010-06-29 20:55:04 +0400 |
commit | a7fb2aba9df616e13eeff34a7701d6065b77ff6a (patch) | |
tree | 737deea78d802c529275c7f7840bcd537970f545 /source/blender/gpu/GPU_material.h | |
parent | 854da3194e6c7d32d2d50361c237f398af2844a5 (diff) | |
parent | 0795d1cccb1e0dcff59847523e6a57a299853bc8 (diff) |
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r29583:29790
Diffstat (limited to 'source/blender/gpu/GPU_material.h')
0 files changed, 0 insertions, 0 deletions