[Bf-blender-cvs] [196d26f] master: Fix T46144: blender internal face texture color wrong in raytraced reflection.

[Brecht Van Lommel]

Commit: 196d26fb1404f580766bf7743c8e5298d5651492
Author: Brecht Van Lommel
Date:   Sun Sep 20 22:51:10 2015 +0200
Branches: master
https://developer.blender.org/rB196d26fb1404f580766bf7743c8e5298d5651492

Fix T46144: blender internal face texture color wrong in raytraced reflection.

===================================================================

M	source/blender/render/intern/source/rayshade.c

===================================================================

diff --git a/source/blender/render/intern/source/rayshade.c b/source/blender/render/intern/source/rayshade.c
index 70a8fdf..900312e 100644
--- a/source/blender/render/intern/source/rayshade.c
+++ b/source/blender/render/intern/source/rayshade.c
@@ -736,6 +736,7 @@ static void traceray(ShadeInput *origshi, ShadeResult *origshr, short depth, con
 		//shi.sample= 0; // memset above, so don't need this
 		shi.xs= origshi->xs;
 		shi.ys= origshi->ys;
+		shi.do_manage= origshi->do_manage;
 		shi.lay= origshi->lay;
 		shi.passflag= SCE_PASS_COMBINED; /* result of tracing needs no pass info */
 		shi.combinedflag= 0xFFFFFF;		 /* ray trace does all options */
@@ -1622,6 +1623,7 @@ static void ray_trace_shadow_tra(Isect *is, ShadeInput *origshi, int depth, int
 	
 		shi.xs= origshi->xs;
 		shi.ys= origshi->ys;
+		shi.do_manage= origshi->do_manage;
 		shi.lay= origshi->lay;
 		shi.nodes= origshi->nodes;