[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58550] trunk/blender/intern/cycles/kernel /kernel_random.h: Cycles / CMJ:

[Thomas Dinges]

Revision: 58550
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58550
Author:   dingto
Date:     2013-07-23 16:23:30 +0000 (Tue, 23 Jul 2013)
Log Message:
-----------
Cycles / CMJ:
* path_rng_2D() was missing an else branch for the sobol case after fix in r57383.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57383

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/kernel_random.h

Modified: trunk/blender/intern/cycles/kernel/kernel_random.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_random.h	2013-07-23 16:04:49 UTC (rev 58549)
+++ trunk/blender/intern/cycles/kernel/kernel_random.h	2013-07-23 16:23:30 UTC (rev 58550)
@@ -141,11 +141,13 @@
 		int p = *rng + dimension;
 		cmj_sample_2D(sample, num_samples, p, fx, fy);
 	}
+	else
 #endif
-
-	/* sobol */
-	*fx = path_rng_1D(kg, rng, sample, num_samples, dimension);
-	*fy = path_rng_1D(kg, rng, sample, num_samples, dimension + 1);
+	{
+		/* sobol */
+		*fx = path_rng_1D(kg, rng, sample, num_samples, dimension);
+		*fy = path_rng_1D(kg, rng, sample, num_samples, dimension + 1);
+	}
 }
 
 __device_inline void path_rng_init(KernelGlobals *kg, __global uint *rng_state, int sample, int num_samples, RNG *rng, int x, int y, float *fx, float *fy)