[Bf-blender-cvs] [7f877ee0427] master: Merge branch 'blender-v3.2-release'

[Brecht Van Lommel]

Commit: 7f877ee042748f4df7a92a3e84218ea7854b9275
Author: Brecht Van Lommel
Date:   Mon May 30 14:09:13 2022 +0200
Branches: master
https://developer.blender.org/rB7f877ee042748f4df7a92a3e84218ea7854b9275

Merge branch 'blender-v3.2-release'

===================================================================



===================================================================

diff --cc intern/opensubdiv/internal/evaluator/eval_output.h
index c0da108edca,57a9fab490f..e8480e8d816
--- a/intern/opensubdiv/internal/evaluator/eval_output.h
+++ b/intern/opensubdiv/internal/evaluator/eval_output.h
@@@ -371,25 -366,16 +375,16 @@@ class VolatileEvalOutput : public EvalO
      varying_stencils_ = convertToCompatibleStencilTable<STENCIL_TABLE>(varying_stencils,
                                                                         device_context_);
  
-     // Optionally allocate additional data to be subdivided like vertex coordinates.
-     if (vertex_data_width > 0) {
-       src_vertex_data_ = SRC_VERTEX_BUFFER::Create(
-           vertex_data_width, num_total_vertices, device_context_);
-     }
-     else {
-       src_vertex_data_ = NULL;
-     }
- 
      // Create evaluators for every face varying channel.
 -    face_varying_evaluators.reserve(all_face_varying_stencils.size());
 +    face_varying_evaluators_.reserve(all_face_varying_stencils.size());
      int face_varying_channel = 0;
      for (const StencilTable *face_varying_stencils : all_face_varying_stencils) {
 -      face_varying_evaluators.push_back(new FaceVaryingEval(face_varying_channel,
 -                                                            face_varying_stencils,
 -                                                            face_varying_width,
 -                                                            patch_table_,
 -                                                            evaluator_cache_,
 -                                                            device_context_));
 +      face_varying_evaluators_.push_back(new FaceVaryingEval(face_varying_channel,
 +                                                             face_varying_stencils,
 +                                                             face_varying_width,
 +                                                             patch_table_,
 +                                                             evaluator_cache_,
 +                                                             device_context_));
        ++face_varying_channel;
      }
    }
diff --cc intern/opensubdiv/internal/evaluator/evaluator_capi.cc
index 5a3a2ff131c,b8d603ec380..7f30e0e5660
--- a/intern/opensubdiv/internal/evaluator/evaluator_capi.cc
+++ b/intern/opensubdiv/internal/evaluator/evaluator_capi.cc
@@@ -226,13 -226,10 +232,15 @@@ void wrapFVarSrcBuffer(struct OpenSubdi
    evaluator->impl->eval_output->wrapFVarSrcBuffer(face_varying_channel, src_buffer);
  }
  
 +bool hasVertexData(struct OpenSubdiv_Evaluator *evaluator)
 +{
 +  return evaluator->impl->eval_output->hasVertexData();
 +}
 +
  void assignFunctionPointers(OpenSubdiv_Evaluator *evaluator)
  {
+   evaluator->setSettings = setSettings;
+ 
    evaluator->setCoarsePositions = setCoarsePositions;
    evaluator->setVertexData = setVertexData;
    evaluator->setVaryingData = setVaryingData;