[Bf-blender-cvs] [cf394a3] cycles_bvh: Cycles: Fix crash rendering mesh with hair

[Sergey Sharybin]

Commit: cf394a3321cbf4ce63e7099a3b432717f8e99b0a
Author: Sergey Sharybin
Date:   Mon Jun 13 18:00:15 2016 +0200
Branches: cycles_bvh
https://developer.blender.org/rBcf394a3321cbf4ce63e7099a3b432717f8e99b0a

Cycles: Fix crash rendering mesh with hair

===================================================================

M	intern/cycles/render/mesh.cpp

===================================================================

diff --git a/intern/cycles/render/mesh.cpp b/intern/cycles/render/mesh.cpp
index 59d1515..8034a20 100644
--- a/intern/cycles/render/mesh.cpp
+++ b/intern/cycles/render/mesh.cpp
@@ -1100,7 +1100,9 @@ void MeshManager::device_update_mesh(Device *device, DeviceScene *dscene, Scene
 		tri_prim_index[i] = -1;
 	}
 	for(size_t i = 0; i < pack.prim_index.size(); ++i) {
-		tri_prim_index[pack.prim_index[i]] = pack.prim_tri_index[i];
+		if ((pack.prim_type[i] & PRIMITIVE_ALL_TRIANGLE) != 0) {
+			tri_prim_index[pack.prim_index[i]] = pack.prim_tri_index[i];
+		}
 	}
 	/* Fill in all the arrays. */
 	if(tri_size != 0) {