[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14923] trunk/blender/source/blender/ render/intern/source/texture.c:

[Brecht Van Lommel]

Revision: 14923
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14923
Author:   blendix
Date:     2008-05-22 15:46:05 +0200 (Thu, 22 May 2008)

Log Message:
-----------

Fix for bug #12334: the Disable Tex option didn't disable
textures for the Texface material option.

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/source/texture.c

Modified: trunk/blender/source/blender/render/intern/source/texture.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/texture.c	2008-05-22 13:32:51 UTC (rev 14922)
+++ trunk/blender/source/blender/render/intern/source/texture.c	2008-05-22 13:46:05 UTC (rev 14923)
@@ -2525,6 +2525,8 @@
 	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) {