[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60176] trunk/blender/intern/cycles: Fix #36725: mismatch between viewport and render result when no world is linked

[Brecht Van Lommel]

Revision: 60176
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60176
Author:   blendix
Date:     2013-09-16 21:05:42 +0000 (Mon, 16 Sep 2013)
Log Message:
-----------
Fix #36725: mismatch between viewport and render result when no world is linked
to the scene in cycles.

Modified Paths:
--------------
    trunk/blender/intern/cycles/kernel/closure/bsdf_hair.h
    trunk/blender/intern/cycles/render/shader.cpp

Modified: trunk/blender/intern/cycles/kernel/closure/bsdf_hair.h
===================================================================
--- trunk/blender/intern/cycles/kernel/closure/bsdf_hair.h	2013-09-16 21:05:39 UTC (rev 60175)
+++ trunk/blender/intern/cycles/kernel/closure/bsdf_hair.h	2013-09-16 21:05:42 UTC (rev 60176)
@@ -74,7 +74,7 @@
 
 	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 @@
 	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);
 

Modified: trunk/blender/intern/cycles/render/shader.cpp
===================================================================
--- trunk/blender/intern/cycles/render/shader.cpp	2013-09-16 21:05:39 UTC (rev 60175)
+++ trunk/blender/intern/cycles/render/shader.cpp	2013-09-16 21:05:42 UTC (rev 60176)
@@ -348,12 +348,6 @@
 	{
 		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;