[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56108] trunk/blender/intern/cycles: Cycles Hair: Corrected own stochastic hair rng mistake and removed an unnecessary padding variable

[Stuart Broadfoot]

Revision: 56108
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56108
Author:   broadstu
Date:     2013-04-17 11:27:56 +0000 (Wed, 17 Apr 2013)
Log Message:
-----------
Cycles Hair: Corrected own stochastic hair rng mistake and removed an 
unnecessary padding variable

- Corrected the Sobol dimension and removed a pad variable in Curve Struct.

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/kernel_path.h
    trunk/blender/intern/cycles/kernel/kernel_types.h
    trunk/blender/intern/cycles/render/mesh.h

Modified: trunk/blender/intern/cycles/kernel/kernel_path.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_path.h    2013-04-17 11:16:53 UTC 
(rev 56107)
+++ trunk/blender/intern/cycles/kernel/kernel_path.h    2013-04-17 11:27:56 UTC 
(rev 56108)
@@ -258,7 +258,7 @@
                        difl = kernel_data.curve_kernel_data.minimum_width * 
len(pixdiff) * 0.5f;
                }
                float extmax = kernel_data.curve_kernel_data.maximum_width;
-               float rng_hair_seed = path_rng(kg, rng, sample, rng_offset + 
PRNG_STOCHASTIC_HAIR);
+               float rng_hair_seed = path_rng(kg, rng, sample, rng_offset + 
PRNG_HAIR);
                uint lcg_state = lcg_init(rng_hair_seed);
 
                bool hit = scene_intersect(kg, &ray, visibility, &isect, 
&lcg_state, difl, extmax);
@@ -930,7 +930,7 @@
                        difl = kernel_data.curve_kernel_data.minimum_width * 
len(pixdiff) * 0.5f;
                }
                float extmax = kernel_data.curve_kernel_data.maximum_width;
-               float rng_hair_seed = path_rng(kg, rng, sample, rng_offset + 
PRNG_STOCHASTIC_HAIR);
+               float rng_hair_seed = path_rng(kg, rng, sample, rng_offset + 
PRNG_HAIR);
                uint lcg_state = lcg_init(rng_hair_seed);
 
                if(!scene_intersect(kg, &ray, visibility, &isect, &lcg_state, 
difl, extmax)) {

Modified: trunk/blender/intern/cycles/kernel/kernel_types.h
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel_types.h   2013-04-17 11:16:53 UTC 
(rev 56107)
+++ trunk/blender/intern/cycles/kernel/kernel_types.h   2013-04-17 11:27:56 UTC 
(rev 56108)
@@ -159,8 +159,8 @@
        PRNG_LIGHT_V = 5,
        PRNG_LIGHT_F = 6,
        PRNG_TERMINATE = 7,
-       PRNG_BOUNCE_NUM = 8,
-       PRNG_STOCHASTIC_HAIR = 9
+       PRNG_HAIR = 8,
+       PRNG_BOUNCE_NUM = 9
 };
 
 /* these flags values correspond to raytypes in osl.cpp, so keep them in sync!

Modified: trunk/blender/intern/cycles/render/mesh.h
===================================================================
--- trunk/blender/intern/cycles/render/mesh.h   2013-04-17 11:16:53 UTC (rev 
56107)
+++ trunk/blender/intern/cycles/render/mesh.h   2013-04-17 11:27:56 UTC (rev 
56108)
@@ -55,7 +55,6 @@
                int first_key;
                int num_keys;
                uint shader;
-               uint pad;
 
                int num_segments() { return num_keys - 1; }
        };

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs