diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-12-10 17:47:58 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-12-10 17:47:58 +0400 |
| commit | 849bdec99aab586e810c3f9ee915a29c83e48941 (patch) | |
| tree | 3b481ba5afe8d3d90463186449c56c75befc7d4a | |
| parent | d576f10f5b554d66f440e7162d35b892422fe878 (diff) | |
| parent | 919311a654891d5472711579ab824e0ab4c2c8b4 (diff) | |
Merging r52842 through r52844 into blender-2.65-release
| -rw-r--r-- | intern/cycles/kernel/osl/osl_shader.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/kernel/osl/osl_shader.cpp b/intern/cycles/kernel/osl/osl_shader.cpp index f72e4dd1384..32712b25e92 100644 --- a/intern/cycles/kernel/osl/osl_shader.cpp +++ b/intern/cycles/kernel/osl/osl_shader.cpp @@ -152,6 +152,7 @@ static void flatten_surface_closure_tree(ShaderData *sd, bool no_glossy, sc.sample_weight = sample_weight; sc.type = bsdf->shaderclosure_type(); + sc.N = bsdf->sc.N; /* needed for AO */ /* add */ if(sc.sample_weight > 1e-5f && sd->num_closure < MAX_CLOSURE) { |