diff options
| author | Ton Roosendaal <ton@blender.org> | 2010-02-13 16:09:30 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2010-02-13 16:09:30 +0300 |
| commit | b673f7318c9733f009acfae1b640ca14eec79047 (patch) | |
| tree | 15c34a90d192b91a3f52b562fdbed0abd413e12b /source/blender/gpu/intern/gpu_material.c | |
| parent | c1ee920db648af27a7912c997b270d2ed2fdf293 (diff) | |
Added support for animated texture draw, GLSL textures.
Note, this is not like GE ffmpg, but Blender Image Texture
display for GLSL materials. Speed can be disappointing,
use smaller images for realtime edits.
Diffstat (limited to 'source/blender/gpu/intern/gpu_material.c')
| -rw-r--r-- | source/blender/gpu/intern/gpu_material.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c index 3b33c2eba62..0d2b6747f79 100644 --- a/source/blender/gpu/intern/gpu_material.c +++ b/source/blender/gpu/intern/gpu_material.c @@ -960,7 +960,7 @@ static void do_material_tex(GPUShadeInput *shi) rgbnor = 0; if(tex && tex->type == TEX_IMAGE && tex->ima) { - GPU_link(mat, "mtex_image", texco, GPU_image(tex->ima, NULL), &tin, &trgb, &tnor); + GPU_link(mat, "mtex_image", texco, GPU_image(tex->ima, &tex->iuser), &tin, &trgb, &tnor); rgbnor= TEX_RGB; if(tex->imaflag & TEX_USEALPHA) |