Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles: Fix regression introduced in c96a4c8

Browse Source 
A few places still needed to be updated to use the new Mesh::num_triangles()
method; wrong number from triangles.size() was causing crashes.
This commit is contained in:
Mai Lavelle
2016-06-02 20:57:04 -04:00
parent f08018f928
commit b6954c8da1
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/subd/subd_dice.cpp
View File

@@ -46,7 +46,7 @@ void EdgeDice::reserve(int num_verts)
Mesh *mesh = params.mesh;
vert_offset = mesh->verts.size();
tri_offset = mesh->triangles.size();
tri_offset = mesh->num_triangles();
mesh->resize_mesh(vert_offset + num_verts, tri_offset);
@@ -84,7 +84,7 @@ void EdgeDice::add_triangle(Patch *patch, int v0, int v1, int v2)
/* todo: optimize so we can reserve in advance, this is like push_back_slow() */
if(mesh->triangles.size() == mesh->triangles.capacity())
mesh->reserve_mesh(mesh->verts.size(), size_t(max(mesh->triangles.size() + 1, 1) * 1.2));
mesh->reserve_mesh(mesh->verts.size(), size_t(max(mesh->num_triangles() + 1, 1) * 1.2));
mesh->add_triangle(v0, v1, v2, params.shader, params.smooth, false);