[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27436] branches/render25/source/blender/ render/intern/source/shadeoutput.c: Render Branch: fixes to get result ramps more similar to trunk.

[Brecht Van Lommel]

Revision: 27436
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27436
Author:   blendix
Date:     2010-03-12 12:28:17 +0100 (Fri, 12 Mar 2010)

Log Message:
-----------
Render Branch: fixes to get result ramps more similar to trunk.

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

Modified: branches/render25/source/blender/render/intern/source/shadeoutput.c
===================================================================
--- branches/render25/source/blender/render/intern/source/shadeoutput.c	2010-03-12 11:14:15 UTC (rev 27435)
+++ branches/render25/source/blender/render/intern/source/shadeoutput.c	2010-03-12 11:28:17 UTC (rev 27436)
@@ -84,7 +84,7 @@
 	float *diff= shr->diff;
 	float *spec= shr->spec;
 
-	if(ma->ramp_col && ma->rampin_col==MA_RAMP_IN_RESULT) {
+	if((ma->mode & MA_RAMP_COL) && ma->ramp_col && ma->rampin_col==MA_RAMP_IN_RESULT) {
 		fac= rgb_to_grayscale(diff);
 		do_colorband(ma->ramp_col, fac, col);
 		
@@ -93,7 +93,7 @@
 		ramp_blend(ma->rampblend_col, diff, diff+1, diff+2, fac, col);
 	}
 
-	if(ma->ramp_spec && ma->rampin_spec==MA_RAMP_IN_RESULT) {
+	if((ma->mode & MA_RAMP_SPEC) && ma->ramp_spec && ma->rampin_spec==MA_RAMP_IN_RESULT) {
 		fac= rgb_to_grayscale(spec);
 		do_colorband(ma->ramp_spec, fac, col);
 		
@@ -815,12 +815,12 @@
 	/* indirect light from environment and other surfaces */
 	shade_surface_indirect(re, shi, shr, backside); /* .diff, .spec, .refl, .refr */
 
+	/* result ramps */
+	shade_surface_result_ramps(re, shi, shr);
+
 	/* subsurface scattering */
 	shade_surface_sss(re, shi, shr);
 
-	/* result ramps */
-	shade_surface_result_ramps(re, shi, shr);
-
 	/* add diffuse + specular into combined */
 	add_v3_v3v3(shr->combined, shr->emit, shr->diff);