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.

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];
+						}
 					}
 				}
 			}