From f1b21d5960d94e518c950a932de1ebdd50ad860c Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 27 Feb 2017 15:11:51 +0100 Subject: [PATCH] Fix T50634: Hair Primitive as Triangles + Hair shader with a texture = crash Attributes were not resized after pushing new triangles to the mesh. --- intern/cycles/blender/blender_curves.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/intern/cycles/blender/blender_curves.cpp b/intern/cycles/blender/blender_curves.cpp index 7365f39aaae..ffa5b676917 100644 --- a/intern/cycles/blender/blender_curves.cpp +++ b/intern/cycles/blender/blender_curves.cpp @@ -411,6 +411,7 @@ static void ExportCurveTrianglePlanes(Mesh *mesh, ParticleCurveData *CData, } } + mesh->resize_mesh(mesh->verts.size(), mesh->triangles.size()); mesh->attributes.remove(ATTR_STD_VERTEX_NORMAL); mesh->attributes.remove(ATTR_STD_FACE_NORMAL); mesh->add_face_normals(); @@ -545,6 +546,7 @@ static void ExportCurveTriangleGeometry(Mesh *mesh, } } + mesh->resize_mesh(mesh->verts.size(), mesh->triangles.size()); mesh->attributes.remove(ATTR_STD_VERTEX_NORMAL); mesh->attributes.remove(ATTR_STD_FACE_NORMAL); mesh->add_face_normals();