diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-09-17 01:05:42 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-09-17 01:05:42 +0400 |
commit | 2513886f437d66e2609eac37f75c92d7c0ace648 (patch) | |
tree | 801a67049d934c8c2318cb6f1edda87102f1508c /intern/cycles | |
parent | bf8c078c55965b887ab8b63d5feb1988409af23f (diff) |
Fix #36725: mismatch between viewport and render result when no world is linked
to the scene in cycles.
Diffstat (limited to 'intern/cycles')
-rw-r--r-- | intern/cycles/kernel/closure/bsdf_hair.h | 4 | ||||
-rw-r--r-- | intern/cycles/render/shader.cpp | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/intern/cycles/kernel/closure/bsdf_hair.h b/intern/cycles/kernel/closure/bsdf_hair.h index 5791598459c..5a5f0360e5b 100644 --- a/intern/cycles/kernel/closure/bsdf_hair.h +++ b/intern/cycles/kernel/closure/bsdf_hair.h @@ -74,7 +74,7 @@ __device float3 bsdf_hair_reflection_eval_reflect(const ShaderClosure *sc, const float Iz = dot(Tg, I); float3 locy = normalize(I - Tg * Iz); - float3 locx = cross(locy, Tg); + //float3 locx = cross(locy, Tg); float theta_r = M_PI_2_F - safe_acosf(Iz); @@ -130,7 +130,7 @@ __device float3 bsdf_hair_transmission_eval_transmit(const ShaderClosure *sc, co float roughness2 = sc->data1; float Iz = dot(Tg, I); float3 locy = normalize(I - Tg * Iz); - float3 locx = cross(locy, Tg); + //float3 locx = cross(locy, Tg); float theta_r = M_PI_2_F - safe_acosf(Iz); diff --git a/intern/cycles/render/shader.cpp b/intern/cycles/render/shader.cpp index 6e3a4695d71..385395e3752 100644 --- a/intern/cycles/render/shader.cpp +++ b/intern/cycles/render/shader.cpp @@ -348,12 +348,6 @@ void ShaderManager::add_default(Scene *scene) { graph = new ShaderGraph(); - closure = graph->add(new BackgroundNode()); - closure->input("Color")->value = make_float3(0.8f, 0.8f, 0.8f); - out = graph->output(); - - graph->connect(closure->output("Background"), out->input("Surface")); - shader = new Shader(); shader->name = "default_background"; shader->graph = graph; |