Commit: 6b1dad2e9386f84b4fb64dd59686c25eaeb35652
Author: Thomas Dinges
Date: Thu Jul 10 01:49:34 2014 +0200
https://developer.blender.org/rB6b1dad2e9386f84b4fb64dd59686c25eaeb35652
Cleanup: Same thing in path trace setup, we can safely always assign the proper
value.
===================================================================
M intern/cycles/kernel/kernel_path.h
===================================================================
diff --git a/intern/cycles/kernel/kernel_path.h
b/intern/cycles/kernel/kernel_path.h
index 0b7d5ac..0c033f6 100644
--- a/intern/cycles/kernel/kernel_path.h
+++ b/intern/cycles/kernel/kernel_path.h
@@ -1050,11 +1050,8 @@ ccl_device_inline void
kernel_path_trace_setup(KernelGlobals *kg, ccl_global uin
{
float filter_u;
float filter_v;
-#ifdef __CMJ__
+
int num_samples = kernel_data.integrator.aa_samples;
-#else
- int num_samples = 0;
-#endif
path_rng_init(kg, rng_state, sample, num_samples, rng, x, y, &filter_u,
&filter_v);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
