From a8233d7c4424d2a41d8abfd4c9d6ca4ea56a56f2 Mon Sep 17 00:00:00 2001
From: Sergey Sharybin <sergey.vfx@gmail.com>
Date: Sat, 28 Jun 2014 01:19:26 +0600
Subject: Fix T40797: Crash on render on specific file with volumentrics and
 'use hair' clicked on render layer

---
 intern/cycles/render/mesh.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'intern/cycles/render')

diff --git a/intern/cycles/render/mesh.cpp b/intern/cycles/render/mesh.cpp
index 3a95f5c106b..273443034c5 100644
--- a/intern/cycles/render/mesh.cpp
+++ b/intern/cycles/render/mesh.cpp
@@ -766,7 +766,7 @@ static void update_attribute_element_offset(Mesh *mesh, vector<float>& attr_floa
 			VoxelAttribute *voxel_data = mattr->data_voxel();
 			offset = voxel_data->slot;
 		}
-		if(mattr->element == ATTR_ELEMENT_CORNER_BYTE) {
+		else if(mattr->element == ATTR_ELEMENT_CORNER_BYTE) {
 			uchar4 *data = mattr->data_uchar4();
 			offset = attr_uchar4.size();
 
-- 
cgit v1.2.3