diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-02-20 16:47:46 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-02-20 16:47:46 +0300 |
commit | 9315cc443b1db112ca7507765e64034fdc539177 (patch) | |
tree | 7c223bdd90cec81e2ed7d33d1f213dfe2fe825ec /intern/cycles/blender/blender_curves.cpp | |
parent | ffd66ce7d54df3a950394fa157b77f38c09583e2 (diff) |
Cycles: Fix wrong vertex color and UV for hair
Was introduced by rB03013c23179 and caused by missing
occasions of when hair strands are zero length.
Diffstat (limited to 'intern/cycles/blender/blender_curves.cpp')
-rw-r--r-- | intern/cycles/blender/blender_curves.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/intern/cycles/blender/blender_curves.cpp b/intern/cycles/blender/blender_curves.cpp index 7c40edfdc8f..183376db4c1 100644 --- a/intern/cycles/blender/blender_curves.cpp +++ b/intern/cycles/blender/blender_curves.cpp @@ -1035,9 +1035,9 @@ void BlenderSync::sync_curves(Mesh *mesh, size_t i = 0; /* Encode vertex color using the sRGB curve. */ - for(size_t curve = 0; curve < CData.curve_vcol.size(); curve++) - if(!(CData.curve_keynum[curve] <= 1 || CData.curve_length[curve] == 0.0f)) - fdata[i++] = color_srgb_to_linear_v3(CData.curve_vcol[curve]); + for(size_t curve = 0; curve < CData.curve_vcol.size(); curve++) { + fdata[i++] = color_srgb_to_linear_v3(CData.curve_vcol[curve]); + } } } } @@ -1080,9 +1080,9 @@ void BlenderSync::sync_curves(Mesh *mesh, if(uv) { size_t i = 0; - for(size_t curve = 0; curve < CData.curve_uv.size(); curve++) - if(!(CData.curve_keynum[curve] <= 1 || CData.curve_length[curve] == 0.0f)) - uv[i++] = CData.curve_uv[curve]; + for(size_t curve = 0; curve < CData.curve_uv.size(); curve++) { + uv[i++] = CData.curve_uv[curve]; + } } } } |