Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
yunfeibai
2017-02-03 12:32:08 -08:00
parent ac5a8aa2d6 c1eabcf059
commit 3442b6524a
10 changed files with 170 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/ThirdPartyLibs/Wavefront/tiny_obj_loader.cpp
View File

@@ -211,7 +211,7 @@ updateVertex(
positions.push_back(in_positions[3*i.v_idx+1]);
positions.push_back(in_positions[3*i.v_idx+2]);
if (i.vn_idx >= 0) {
if (i.vn_idx >= 0 && ((3*i.vn_idx+2)<in_normals.size())) {
normals.push_back(in_normals[3*i.vn_idx+0]);
normals.push_back(in_normals[3*i.vn_idx+1]);
normals.push_back(in_normals[3*i.vn_idx+2]);