Merge branch 'blender-v3.2-release'

1 files changed, 51 insertions, 3 deletions

diff --git a/source/blender/blenkernel/intern/subdiv_eval.c b/source/blender/blenkernel/intern/subdiv_eval.c
index 37978d5c2cc..562bf2e7d61 100644
--- a/source/blender/blenkernel/intern/subdiv_eval.c
+++ b/source/blender/blenkernel/intern/subdiv_eval.c
@@ -48,7 +48,8 @@ static eOpenSubdivEvaluator opensubdiv_evalutor_from_subdiv_evaluator_type(
 
 bool BKE_subdiv_eval_begin(Subdiv *subdiv,
                            eSubdivEvaluatorType evaluator_type,
-                           OpenSubdiv_EvaluatorCache *evaluator_cache)
+                           OpenSubdiv_EvaluatorCache *evaluator_cache,
+                           const OpenSubdiv_EvaluatorSettings *settings)
 {
   BKE_subdiv_stats_reset(&subdiv->stats, SUBDIV_STATS_EVALUATOR_CREATE);
   if (subdiv->topology_refiner == NULL) {
@@ -61,7 +62,7 @@ bool BKE_subdiv_eval_begin(Subdiv *subdiv,
         opensubdiv_evalutor_from_subdiv_evaluator_type(evaluator_type);
     BKE_subdiv_stats_begin(&subdiv->stats, SUBDIV_STATS_EVALUATOR_CREATE);
     subdiv->evaluator = openSubdiv_createEvaluatorFromTopologyRefiner(
-        subdiv->topology_refiner, opensubdiv_evaluator_type, evaluator_cache);
+        subdiv->topology_refiner, opensubdiv_evaluator_type, evaluator_cache, settings);
     BKE_subdiv_stats_end(&subdiv->stats, SUBDIV_STATS_EVALUATOR_CREATE);
     if (subdiv->evaluator == NULL) {
       return false;
@@ -183,13 +184,52 @@ static void set_face_varying_data_from_uv(Subdiv *subdiv,
   MEM_freeN(buffer);
 }
 
+static void set_vertex_data_from_orco(Subdiv *subdiv, const Mesh *mesh)
+{
+  const float(*orco)[3] = CustomData_get_layer(&mesh->vdata, CD_ORCO);
+  const float(*cloth_orco)[3] = CustomData_get_layer(&mesh->vdata, CD_CLOTH_ORCO);
+
+  if (orco || cloth_orco) {
+    OpenSubdiv_TopologyRefiner *topology_refiner = subdiv->topology_refiner;
+    OpenSubdiv_Evaluator *evaluator = subdiv->evaluator;
+    const int num_verts = topology_refiner->getNumVertices(topology_refiner);
+
+    if (orco && cloth_orco) {
+      /* Set one by one if have both. */
+      for (int i = 0; i < num_verts; i++) {
+        float data[6];
+        copy_v3_v3(data, orco[i]);
+        copy_v3_v3(data + 3, cloth_orco[i]);
+        evaluator->setVertexData(evaluator, data, i, 1);
+      }
+    }
+    else {
+      /* Faster single call if we have either. */
+      if (orco) {
+        evaluator->setVertexData(evaluator, orco[0], 0, num_verts);
+      }
+      else if (cloth_orco) {
+        evaluator->setVertexData(evaluator, cloth_orco[0], 0, num_verts);
+      }
+    }
+  }
+}
+
+static void get_mesh_evaluator_settings(OpenSubdiv_EvaluatorSettings *settings, const Mesh *mesh)
+{
+  settings->num_vertex_data = (CustomData_has_layer(&mesh->vdata, CD_ORCO) ? 3 : 0) +
+                              (CustomData_has_layer(&mesh->vdata, CD_CLOTH_ORCO) ? 3 : 0);
+}
+
 bool BKE_subdiv_eval_begin_from_mesh(Subdiv *subdiv,
                                      const Mesh *mesh,
                                      const float (*coarse_vertex_cos)[3],
                                      eSubdivEvaluatorType evaluator_type,
                                      OpenSubdiv_EvaluatorCache *evaluator_cache)
 {
-  if (!BKE_subdiv_eval_begin(subdiv, evaluator_type, evaluator_cache)) {
+  OpenSubdiv_EvaluatorSettings settings = {0};
+  get_mesh_evaluator_settings(&settings, mesh);
+  if (!BKE_subdiv_eval_begin(subdiv, evaluator_type, evaluator_cache, &settings)) {
     return false;
   }
   return BKE_subdiv_eval_refine_from_mesh(subdiv, mesh, coarse_vertex_cos);
@@ -212,6 +252,8 @@ bool BKE_subdiv_eval_refine_from_mesh(Subdiv *subdiv,
     const MLoopUV *mloopuv = CustomData_get_layer_n(&mesh->ldata, CD_MLOOPUV, layer_index);
     set_face_varying_data_from_uv(subdiv, mesh, mloopuv, layer_index);
   }
+  /* Set vertex data to orco. */
+  set_vertex_data_from_orco(subdiv, mesh);
   /* Update evaluator to the new coarse geometry. */
   BKE_subdiv_stats_begin(&subdiv->stats, SUBDIV_STATS_EVALUATOR_REFINE);
   subdiv->evaluator->refine(subdiv->evaluator);
@@ -287,6 +329,12 @@ void BKE_subdiv_eval_limit_point_and_normal(Subdiv *subdiv,
   normalize_v3(r_N);
 }
 
+void BKE_subdiv_eval_vertex_data(
+    Subdiv *subdiv, const int ptex_face_index, const float u, const float v, float r_vertex_data[])
+{
+  subdiv->evaluator->evaluateVertexData(subdiv->evaluator, ptex_face_index, u, v, r_vertex_data);
+}
+
 void BKE_subdiv_eval_face_varying(Subdiv *subdiv,
                                   const int face_varying_channel,
                                   const int ptex_face_index,