diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-05-22 17:46:05 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-05-22 17:46:05 +0400 |
| commit | 5cf41da316001ddedd0e11ec2fa4648c02cb97c4 (patch) | |
| tree | 483df45ba4412b9be66c9f9b8670441264a6025e /source/blender/render | |
| parent | a4688b24dcd66b8473015950b968087ad4b1cf9f (diff) | |
Fix for bug #12334: the Disable Tex option didn't disable
textures for the Texface material option.
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/texture.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/render/intern/source/texture.c b/source/blender/render/intern/source/texture.c index 0a72f976825..3d448b66e93 100644 --- a/source/blender/render/intern/source/texture.c +++ b/source/blender/render/intern/source/texture.c @@ -2525,6 +2525,8 @@ void render_realtime_texture(ShadeInput *shi, Image *ima) ShadeInputUV *suv= &shi->uv[shi->actuv]; int a; + if(R.r.scemode & R_NO_TEX) return; + if(firsttime) { BLI_lock_thread(LOCK_IMAGE); if(firsttime) { |