[Bf-blender-cvs] [a8233d7] master: Fix T40797: Crash on render on specific file with volumentrics and 'use hair' clicked on render layer

[Sergey Sharybin]

Commit: a8233d7c4424d2a41d8abfd4c9d6ca4ea56a56f2
Author: Sergey Sharybin
Date:   Sat Jun 28 01:19:26 2014 +0600
https://developer.blender.org/rBa8233d7c4424d2a41d8abfd4c9d6ca4ea56a56f2

Fix T40797: Crash on render on specific file with volumentrics and 'use hair' clicked on render layer

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

M	intern/cycles/render/mesh.cpp

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

diff --git a/intern/cycles/render/mesh.cpp b/intern/cycles/render/mesh.cpp
index 3a95f5c..2734430 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();