History

merge from upstream

Seth Alves committed 8 years ago

Commit 1cbc2e32 parents f6b4cf4 7fe4f84218 files · +7684 −4531Browse files

Showing the changes to libraries/render-utils/src/Model.cpp (1 of 218 files). Show all

Unified · Split

libraries/render-utils/src/Model.cpp+4−2
@@ -1110,7 +1110,9 @@ void Blender::run() { · 1109 unmodified lines
11101110 int index = blendshape.indices.at(j);
11111111 meshVertices[index] += blendshape.vertices.at(j) * vertexCoefficient;
11121112 meshNormals[index] += blendshape.normals.at(j) * normalCoefficient;
1113− meshTangents[index] += blendshape.tangents.at(j) * normalCoefficient;
1113+ if (blendshape.tangents.size() > j) {
1114+ meshTangents[index] += blendshape.tangents.at(j) * normalCoefficient;
1115+ }
11141116 }
11151117 }
11161118 }
@@ -1312,7 +1314,7 @@ void Model::setBlendedVertices(int blendNumber, const Geometry::WeakPointer& geo · 195 unmodified lines
13121314
13131315 normalsAndTangents.clear();
13141316 normalsAndTangents.resize(normals.size()+tangents.size());
1315− assert(normalsAndTangents.size() == 2 * vertexCount);
1317+// assert(normalsAndTangents.size() == 2 * vertexCount);
13161318
13171319 // Interleave normals and tangents
13181320 #if 0

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t