[Bf-blender-cvs] [a29186efb41] master: Merge branch 'blender2.7'

Brecht Van Lommel noreply at git.blender.org
Mon Mar 18 19:10:34 CET 2019


Commit: a29186efb414cec130dbfe4f81173b64d37ad10a
Author: Brecht Van Lommel
Date:   Mon Mar 18 19:06:21 2019 +0100
Branches: master
https://developer.blender.org/rBa29186efb414cec130dbfe4f81173b64d37ad10a

Merge branch 'blender2.7'

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



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

diff --cc intern/cycles/blender/blender_curves.cpp
index 183376db4c1,35f5db16497..602e63a3e47
--- a/intern/cycles/blender/blender_curves.cpp
+++ b/intern/cycles/blender/blender_curves.cpp
@@@ -247,11 -251,11 +247,11 @@@ static bool ObtainCacheParticleUV(Mesh 
  				b_psys.particles.begin(b_pa);
  				for(; pa_no < totparts+totchild; pa_no++) {
  					/* Add UVs */
 -					BL::Mesh::tessface_uv_textures_iterator l;
 -					b_mesh->tessface_uv_textures.begin(l);
 +					BL::Mesh::uv_layers_iterator l;
 +					b_mesh->uv_layers.begin(l);
  
- 					float3 uv = make_float3(0.0f, 0.0f, 0.0f);
+ 					float2 uv = make_float2(0.0f, 0.0f);
 -					if(b_mesh->tessface_uv_textures.length())
 +					if(b_mesh->uv_layers.length())
  						b_psys.uv_on_emitter(psmd, *b_pa, pa_no, uv_num, &uv.x);
  					CData->curve_uv.push_back_slow(uv);
  
@@@ -764,33 -784,24 +760,21 @@@ static void ExportCurveTriangleUV(Parti
  
  	for(int sys = 0; sys < CData->psys_firstcurve.size(); sys++) {
  		for(int curve = CData->psys_firstcurve[sys]; curve < CData->psys_firstcurve[sys] + CData->psys_curvenum[sys]; curve++) {
 -			if(CData->curve_keynum[curve] <= 1 || CData->curve_length[curve] == 0.0f)
 -				continue;
 -
  			for(int curvekey = CData->curve_firstkey[curve]; curvekey < CData->curve_firstkey[curve] + CData->curve_keynum[curve] - 1; curvekey++) {
- 				const float curve_time = CData->curvekey_time[curvekey];
- 				const float curve_length = CData->curve_length[curve];
- 				time = (curve_length > 0.0f) ? curve_time / curve_length : 0.0f;
- 
  				for(int section = 0; section < resol; section++) {
  					uvdata[vertexindex] = CData->curve_uv[curve];
- 					uvdata[vertexindex].z = prevtime;
  					vertexindex++;
  					uvdata[vertexindex] = CData->curve_uv[curve];
- 					uvdata[vertexindex].z = time;
  					vertexindex++;
  					uvdata[vertexindex] = CData->curve_uv[curve];
- 					uvdata[vertexindex].z = prevtime;
  					vertexindex++;
  					uvdata[vertexindex] = CData->curve_uv[curve];
- 					uvdata[vertexindex].z = time;
  					vertexindex++;
  					uvdata[vertexindex] = CData->curve_uv[curve];
- 					uvdata[vertexindex].z = prevtime;
  					vertexindex++;
  					uvdata[vertexindex] = CData->curve_uv[curve];
- 					uvdata[vertexindex].z = time;
  					vertexindex++;
  				}
- 
- 				prevtime = time;
  			}
  		}
  	}



More information about the Bf-blender-cvs mailing list