[Bf-blender-cvs] [1cd3676] master: Cleanup, remove unneeded variable.

Thomas Dinges noreply at git.blender.org
Sun Jun 12 00:02:10 CEST 2016


Commit: 1cd3676d4df288153d1ff47f5402d74b929b2be0
Author: Thomas Dinges
Date:   Sun Jun 12 00:01:57 2016 +0200
Branches: master
https://developer.blender.org/rB1cd3676d4df288153d1ff47f5402d74b929b2be0

Cleanup, remove unneeded variable.

===================================================================

M	intern/cycles/render/nodes.cpp

===================================================================

diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp
index 23cd4f0..d018c4f 100644
--- a/intern/cycles/render/nodes.cpp
+++ b/intern/cycles/render/nodes.cpp
@@ -749,10 +749,9 @@ void SkyTextureNode::compile(SVMCompiler& compiler)
 		assert(false);
 
 	int vector_offset = tex_mapping.compile_begin(compiler, vector_in);
-	int sky_model = type;
 
 	compiler.stack_assign(color_out);
-	compiler.add_node(NODE_TEX_SKY, vector_offset, compiler.stack_assign(color_out), sky_model);
+	compiler.add_node(NODE_TEX_SKY, vector_offset, compiler.stack_assign(color_out), type);
 	compiler.add_node(__float_as_uint(sunsky.phi), __float_as_uint(sunsky.theta), __float_as_uint(sunsky.radiance_x), __float_as_uint(sunsky.radiance_y));
 	compiler.add_node(__float_as_uint(sunsky.radiance_z), __float_as_uint(sunsky.config_x[0]), __float_as_uint(sunsky.config_x[1]), __float_as_uint(sunsky.config_x[2]));
 	compiler.add_node(__float_as_uint(sunsky.config_x[3]), __float_as_uint(sunsky.config_x[4]), __float_as_uint(sunsky.config_x[5]), __float_as_uint(sunsky.config_x[6]));
@@ -770,7 +769,6 @@ void SkyTextureNode::compile(OSLCompiler& compiler)
 	tex_mapping.compile(compiler);
 
 	SunSky sunsky;
-
 	if(type == NODE_SKY_OLD)
 		sky_texture_precompute_old(&sunsky, sun_direction, turbidity);
 	else if(type == NODE_SKY_NEW)




More information about the Bf-blender-cvs mailing list