Commits

VirLinden committed f16298a Merge

merge

  • Participants
  • Parent commits 471df7e, 95fa213

Comments (0)

Files changed (2)

File indra/llmath/tests/alignment_test.cpp

 	LLQuad mQ;
 } LL_ALIGN_POSTFIX(16);
 
+
 // Verify that aligned allocators perform as advertised.
 template<> template<>
 void alignment_test_object_t::test<1>()

File indra/llprimitive/llmodel.cpp

 
 	if (tc.get())
 	{
-		LLVector4a::memcpyNonAliased16((F32*) face.mTexCoords, (F32*) tc.get(), num_verts*2*sizeof(F32));
+		U32 tex_size = (num_verts*2*sizeof(F32)+0xF)&~0xF;
+		LLVector4a::memcpyNonAliased16((F32*) face.mTexCoords, (F32*) tc.get(), tex_size);
 	}
 	else
 	{