[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28106] branches/render25/source/blender/ render/intern/source/texture_stack.c: Render Branch: Fix stencil + displacement not working;

[Brecht Van Lommel]

Revision: 28106
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28106
Author:   blendix
Date:     2010-04-09 17:22:29 +0200 (Fri, 09 Apr 2010)

Log Message:
-----------
Render Branch: Fix stencil + displacement not working;

Modified Paths:
--------------
    branches/render25/source/blender/render/intern/source/texture_stack.c

Modified: branches/render25/source/blender/render/intern/source/texture_stack.c
===================================================================
--- branches/render25/source/blender/render/intern/source/texture_stack.c	2010-04-09 13:16:17 UTC (rev 28105)
+++ branches/render25/source/blender/render/intern/source/texture_stack.c	2010-04-09 15:22:29 UTC (rev 28106)
@@ -795,7 +795,7 @@
 			/* only process if this texture is mapped 
 			 * to one that we're interested in */
 			mapto= (mapto_flag == 0)? mtex->mapto: mtex->mapto & mapto_flag;
-			if (!mapto) continue;
+			if (!mapto && !(mtex->texflag & MTEX_STENCIL)) continue;
 
 			/* which coords */
 			if(mtex->texco==TEXCO_ORCO) {