From 209a64111e31a644fd39a0d918c0fafb12e7fbda Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 27 Feb 2017 13:39:23 +0100 Subject: [PATCH] Fix part of T50634: Hair Primitive as Triangles + Hair shader with a texture = crash Wrong formula was used to calculate needed verts and tris to be reserved. --- intern/cycles/blender/blender_curves.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/intern/cycles/blender/blender_curves.cpp b/intern/cycles/blender/blender_curves.cpp index 9214882bb9b..7365f39aaae 100644 --- a/intern/cycles/blender/blender_curves.cpp +++ b/intern/cycles/blender/blender_curves.cpp @@ -434,8 +434,8 @@ static void ExportCurveTriangleGeometry(Mesh *mesh, if(CData->curve_keynum[curve] <= 1 || CData->curve_length[curve] == 0.0f) continue; - numverts += (CData->curve_keynum[curve] - 2)*2*resolution + resolution; - numtris += (CData->curve_keynum[curve] - 2)*resolution; + numverts += (CData->curve_keynum[curve] - 1)*resolution + resolution; + numtris += (CData->curve_keynum[curve] - 1)*2*resolution; } }