diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-06-27 23:19:26 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-06-27 23:20:07 +0400 |
| commit | a8233d7c4424d2a41d8abfd4c9d6ca4ea56a56f2 (patch) | |
| tree | e5e05e3342c8cf8fc6e016ec9da4e868edc1e4fb /intern/cycles/render | |
| parent | 9327538f0abeb768fb89a2aee6b58d36cc9ca18f (diff) | |
Fix T40797: Crash on render on specific file with volumentrics and 'use hair' clicked on render layer
Diffstat (limited to 'intern/cycles/render')
| -rw-r--r-- | intern/cycles/render/mesh.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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(); |