[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58880] trunk/blender: Cycles:

Thomas Dinges blender at dingto.org
Sat Aug 3 23:45:58 CEST 2013


Revision: 58880
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58880
Author:   dingto
Date:     2013-08-03 21:45:57 +0000 (Sat, 03 Aug 2013)
Log Message:
-----------
Cycles: 
* Forgot to rename some SSS pass strings.
* Some typo fixes. 

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/kernel_accumulate.h
    trunk/blender/intern/cycles/kernel/kernel_light.h
    trunk/blender/source/blender/render/intern/source/render_result.c

Modified: trunk/blender/intern/cycles/kernel/kernel_accumulate.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_accumulate.h	2013-08-03 21:01:42 UTC (rev 58879)
+++ trunk/blender/intern/cycles/kernel/kernel_accumulate.h	2013-08-03 21:45:57 UTC (rev 58880)
@@ -286,7 +286,7 @@
 #ifdef __PASSES__
 	/* this division is a bit ugly, but means we only have to keep track of
 	 * only a single throughput further along the path, here we recover just
-	 * the indirect parth that is not influenced by any particular BSDF type */
+	 * the indirect path that is not influenced by any particular BSDF type */
 	if(L->use_light_pass) {
 		L->direct_emission = safe_divide_color(L->direct_emission, L->direct_throughput);
 		L->direct_diffuse += L->path_diffuse*L->direct_emission;

Modified: trunk/blender/intern/cycles/kernel/kernel_light.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_light.h	2013-08-03 21:01:42 UTC (rev 58879)
+++ trunk/blender/intern/cycles/kernel/kernel_light.h	2013-08-03 21:45:57 UTC (rev 58880)
@@ -375,7 +375,7 @@
 		ls->pdf = invarea;
 
 		if(type == LIGHT_SPOT) {
-			/* spot light attentuation */
+			/* spot light attenuation */
 			float4 data2 = kernel_tex_fetch(__light_data, lamp*LIGHT_SIZE + 2);
 			ls->eval_fac *= spot_light_attenuation(data1, data2, ls);
 

Modified: trunk/blender/source/blender/render/intern/source/render_result.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/render_result.c	2013-08-03 21:01:42 UTC (rev 58879)
+++ trunk/blender/source/blender/render/intern/source/render_result.c	2013-08-03 21:45:57 UTC (rev 58880)
@@ -283,19 +283,19 @@
 		if (channel == -1) return "SubsurfaceDir";
 		if (channel == 0) return "SubsurfaceDir.R";
 		if (channel == 1) return "SubsurfaceDir.G";
-		return "SubsDir.B";
+		return "SubsurfaceDir.B";
 	}
 	if (passtype == SCE_PASS_SUBSURFACE_INDIRECT) {
 		if (channel == -1) return "SubsurfaceInd";
 		if (channel == 0) return "SubsurfaceInd.R";
 		if (channel == 1) return "SubsurfaceInd.G";
-		return "SubsInd.B";
+		return "SubsurfaceInd.B";
 	}
 	if (passtype == SCE_PASS_SUBSURFACE_COLOR) {
 		if (channel == -1) return "SubsurfaceCol";
 		if (channel == 0) return "SubsurfaceCol.R";
 		if (channel == 1) return "SubsurfaceCol.G";
-		return "SubsCol.B";
+		return "SubsurfaceCol.B";
 	}
 	return "Unknown";
 }




More information about the Bf-blender-cvs mailing list