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

[Sergey Sharybin]

Commit: b712dbe5de2dcba3338f42b74b75388453d52d23
Author: Sergey Sharybin
Date:   Wed May 18 17:03:19 2022 +0200
Branches: master
https://developer.blender.org/rBb712dbe5de2dcba3338f42b74b75388453d52d23

Merge branch 'blender-v3.2-release'

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



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

diff --cc intern/opensubdiv/internal/evaluator/eval_output.h
index 9ca09f011a1,cff7c8d18c9..bc5494bfe41
--- a/intern/opensubdiv/internal/evaluator/eval_output.h
+++ b/intern/opensubdiv/internal/evaluator/eval_output.h
@@@ -352,16 -361,26 +361,26 @@@ class VolatileEvalOutput : public EvalO
                                                                        device_context_);
      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;
      }
    }