[Bf-blender-cvs] [5f1bf67] temp-cycles-microdisplacement: Merge branch 'master' into temp-cycles-microdisplacement

Mai Lavelle noreply at git.blender.org
Wed Aug 31 02:13:17 CEST 2016


Commit: 5f1bf679bb11b9dc12741d19fab23d3840495d8f
Author: Mai Lavelle
Date:   Fri Aug 26 12:26:26 2016 -0400
Branches: temp-cycles-microdisplacement
https://developer.blender.org/rB5f1bf679bb11b9dc12741d19fab23d3840495d8f

Merge branch 'master' into temp-cycles-microdisplacement

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



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

diff --cc intern/cycles/render/mesh.cpp
index 5299768,35d1a44..66843e9
--- a/intern/cycles/render/mesh.cpp
+++ b/intern/cycles/render/mesh.cpp
@@@ -668,20 -673,18 +695,18 @@@ void Mesh::pack_curves(Scene *scene, fl
  	/* pack curve segments */
  	size_t curve_num = num_curves();
  
- 	if(curve_num) {
- 		for(size_t i = 0; i < curve_num; i++) {
- 			Curve curve = get_curve(i);
- 			int shader_id = curve_shader[i];
- 			Shader *shader = (shader_id < used_shaders.size()) ?
- 				used_shaders[shader_id] : scene->default_surface;
- 			shader_id = scene->shader_manager->get_shader_id(shader, false);
- 
- 			curve_data[i] = make_float4(
- 				__int_as_float(curve.first_key + curvekey_offset),
- 				__int_as_float(curve.num_keys),
- 				__int_as_float(shader_id),
- 				0.0f);
- 		}
+ 	for(size_t i = 0; i < curve_num; i++) {
+ 		Curve curve = get_curve(i);
+ 		int shader_id = curve_shader[i];
+ 		Shader *shader = (shader_id < used_shaders.size()) ?
+ 			used_shaders[shader_id] : scene->default_surface;
 -		shader_id = scene->shader_manager->get_shader_id(shader, this, false);
++		shader_id = scene->shader_manager->get_shader_id(shader, false);
+ 
+ 		curve_data[i] = make_float4(
+ 			__int_as_float(curve.first_key + curvekey_offset),
+ 			__int_as_float(curve.num_keys),
+ 			__int_as_float(shader_id),
+ 			0.0f);
  	}
  }




More information about the Bf-blender-cvs mailing list