[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59954] branches/soc-2013-dingto/intern/ cycles/kernel: Volume:

[Thomas Dinges]

Revision: 59954
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59954
Author:   dingto
Date:     2013-09-09 14:17:02 +0000 (Mon, 09 Sep 2013)
Log Message:
-----------
Volume:
* Fix some render errors (no caustics etc.), the patch accidentally removed some lines in kernel_path.h.
* Remove unused bsdf_eval_add() function. 

Modified Paths:
--------------
    branches/soc-2013-dingto/intern/cycles/kernel/kernel_accumulate.h
    branches/soc-2013-dingto/intern/cycles/kernel/kernel_path.h

Modified: branches/soc-2013-dingto/intern/cycles/kernel/kernel_accumulate.h
===================================================================
--- branches/soc-2013-dingto/intern/cycles/kernel/kernel_accumulate.h	2013-09-09 13:55:24 UTC (rev 59953)
+++ branches/soc-2013-dingto/intern/cycles/kernel/kernel_accumulate.h	2013-09-09 14:17:02 UTC (rev 59954)
@@ -108,23 +108,6 @@
 #endif
 }
 
-__device_inline void bsdf_eval_add(BsdfEval *eval, float3 value)
-{
-#ifdef __PASSES__
-	if(eval->use_light_pass) {
-		eval->diffuse += value;
-		eval->glossy += value;
-		eval->transmission += value;
-
-		/* skipping transparent, this function is used by for eval(), will be zero then */
-	}
-	else
-		eval->diffuse += value;
-#else
-	*eval += value;
-#endif
-}
-
 /* Path Radiance
  *
  * We accumulate different render passes separately. After summing at the end

Modified: branches/soc-2013-dingto/intern/cycles/kernel/kernel_path.h
===================================================================
--- branches/soc-2013-dingto/intern/cycles/kernel/kernel_path.h	2013-09-09 13:55:24 UTC (rev 59953)
+++ branches/soc-2013-dingto/intern/cycles/kernel/kernel_path.h	2013-09-09 14:17:02 UTC (rev 59954)
@@ -796,8 +796,13 @@
 		path_radiance_bsdf_bounce(&L, &throughput, &bsdf_eval, bsdf_pdf, state.bounce, label);
 
 		/* set labels */
-		min_ray_pdf = fminf(bsdf_pdf, min_ray_pdf);
-		
+		if(!(label & LABEL_TRANSPARENT)) {
+			ray_pdf = bsdf_pdf;
+#ifdef __LAMP_MIS__
+			ray_t = 0.0f;
+#endif
+			min_ray_pdf = fminf(bsdf_pdf, min_ray_pdf);
+		}
 
 		ray_pdf *= volume_pdf;