Subsurf: Evaluate all UV layers

Before that it was only first UV layer which was properly evaluated,
the rest were ignored. Now all layers are being properly handled.

4 files changed, 13 insertions, 14 deletions

diff --git a/source/blender/blenkernel/BKE_subdiv.h b/source/blender/blenkernel/BKE_subdiv.h
index ad829946db8..cd1e3adbc21 100644
--- a/source/blender/blenkernel/BKE_subdiv.h
+++ b/source/blender/blenkernel/BKE_subdiv.h
@@ -158,6 +158,7 @@ void BKE_subdiv_eval_limit_point_and_short_normal(
 
 void BKE_subdiv_eval_face_varying(
         Subdiv *subdiv,
+        const int face_varying_channel,
         const int ptex_face_index,
         const float u, const float v,
         float varying[2]);
diff --git a/source/blender/blenkernel/intern/subdiv_converter_mesh.c b/source/blender/blenkernel/intern/subdiv_converter_mesh.c
index b1e3be6c799..963f403e8d3 100644
--- a/source/blender/blenkernel/intern/subdiv_converter_mesh.c
+++ b/source/blender/blenkernel/intern/subdiv_converter_mesh.c
@@ -157,7 +157,7 @@ static float get_edge_sharpness(const OpenSubdiv_Converter *converter,
 	        storage->manifold_edge_index_reverse[manifold_edge_index];
 	const MEdge *medge = storage->mesh->medge;
 	const float edge_crease =  (float)medge[edge_index].crease / 255.0f;
-	return edge_crease * storage->settings.level;
+	return edge_crease * storage->settings.level * 10;
 }
 
 
diff --git a/source/blender/blenkernel/intern/subdiv_eval.c b/source/blender/blenkernel/intern/subdiv_eval.c
index 0f928331724..fa9488f15b6 100644
--- a/source/blender/blenkernel/intern/subdiv_eval.c
+++ b/source/blender/blenkernel/intern/subdiv_eval.c
@@ -122,10 +122,11 @@ static void set_face_varying_data_from_uv(Subdiv *subdiv,
 		     vertex_index < num_face_vertices;
 		     vertex_index++, mluv++)
 		{
-			evaluator->setFaceVaryingData(evaluator,
-			                              mluv->uv,
-			                              uv_indicies[vertex_index],
-			                              1);
+		evaluator->setFaceVaryingData(evaluator,
+                                      layer_index,
+		                              mluv->uv,
+		                              uv_indicies[vertex_index],
+		                              1);
 		}
 	}
 }
@@ -147,11 +148,6 @@ void BKE_subdiv_eval_update_from_mesh(Subdiv *subdiv, const Mesh *mesh)
 		const MLoopUV *mloopuv = CustomData_get_layer_n(
 		        &mesh->ldata, CD_MLOOPUV, layer_index);
 		set_face_varying_data_from_uv(subdiv, mloopuv, layer_index);
-		/* NOTE: Currently evaluator can only handle single face varying layer.
-		 * This is a limitation of C-API and some underlying helper classes from
-		 * our side which will get fixed.
-		 */
-		break;
 	}
 	/* Update evaluator to the new coarse geometry. */
 	BKE_subdiv_stats_begin(&subdiv->stats, SUBDIV_STATS_EVALUATOR_REFINE);
@@ -223,12 +219,14 @@ void BKE_subdiv_eval_limit_point_and_short_normal(
 
 void BKE_subdiv_eval_face_varying(
         Subdiv *subdiv,
+        const int face_varying_channel,
         const int ptex_face_index,
         const float u, const float v,
         float face_varying[2])
 {
 #ifdef WITH_OPENSUBDIV
 	subdiv->evaluator->evaluateFaceVarying(subdiv->evaluator,
+	                                       face_varying_channel,
 	                                       ptex_face_index,
 	                                       u, v,
 	                                       face_varying);
diff --git a/source/blender/blenkernel/intern/subdiv_mesh.c b/source/blender/blenkernel/intern/subdiv_mesh.c
index befd2b9847c..a58dbdcff84 100644
--- a/source/blender/blenkernel/intern/subdiv_mesh.c
+++ b/source/blender/blenkernel/intern/subdiv_mesh.c
@@ -1509,25 +1509,25 @@ static void subdiv_eval_uv_layer(SubdivMeshContext *ctx,
 	for (int layer_index = 0; layer_index < ctx->num_uv_layers; layer_index++) {
 		MLoopUV *subdiv_loopuv = &ctx->uv_layers[layer_index][mloop_index];
 		BKE_subdiv_eval_face_varying(subdiv,
+		                             layer_index,
 		                             ptex_face_index,
 		                             u, v,
 		                             subdiv_loopuv[0].uv);
 		BKE_subdiv_eval_face_varying(subdiv,
+		                             layer_index,
 		                             ptex_face_index,
 		                             u + du, v,
 		                             subdiv_loopuv[1].uv);
 		BKE_subdiv_eval_face_varying(subdiv,
+		                             layer_index,
 		                             ptex_face_index,
 		                             u + du, v + dv,
 		                             subdiv_loopuv[2].uv);
 		BKE_subdiv_eval_face_varying(subdiv,
+		                             layer_index,
 		                             ptex_face_index,
 		                             u, v + dv,
 		                             subdiv_loopuv[3].uv);
-		/* TODO(sergey): Currently evaluator only has single UV layer, so can
-		 * not evaluate more than that. Need to be solved.
-		 */
-		break;
 	}
 }