[Bf-blender-cvs] [8513cc6e44d] temp-usd-latest-master: Merge remote-tracking branch 'blender_org/master' into temp-usd-latest-master

[Michael Kowalski]

Commit: 8513cc6e44daec5cafe6740183de07d88e110a50
Author: Michael Kowalski
Date:   Mon Sep 13 21:47:21 2021 -0400
Branches: temp-usd-latest-master
https://developer.blender.org/rB8513cc6e44daec5cafe6740183de07d88e110a50

Merge remote-tracking branch 'blender_org/master' into temp-usd-latest-master

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



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

diff --cc source/blender/io/usd/intern/usd_writer_mesh.cc
index 511dd489023,61b14155dd0..845e451c04d
--- a/source/blender/io/usd/intern/usd_writer_mesh.cc
+++ b/source/blender/io/usd/intern/usd_writer_mesh.cc
@@@ -27,12 -26,11 +27,13 @@@
  #include "BLI_assert.h"
  #include "BLI_math_vector.h"
  
+ #include "BKE_attribute.h"
  #include "BKE_customdata.h"
  #include "BKE_lib_id.h"
 +#include "BKE_library.h"
  #include "BKE_material.h"
  #include "BKE_mesh.h"
 +#include "BKE_mesh_runtime.h"
  #include "BKE_modifier.h"
  #include "BKE_object.h"
  
diff --cc source/blender/io/usd/intern/usd_writer_mesh.h
index 5c7c2bd7cbe,d60a6c4a59b..5a2f52344a9
--- a/source/blender/io/usd/intern/usd_writer_mesh.h
+++ b/source/blender/io/usd/intern/usd_writer_mesh.h
@@@ -49,21 -47,9 +49,21 @@@ class USDGenericMeshWriter : public USD
    void assign_materials(const HierarchyContext &context,
                          pxr::UsdGeomMesh usd_mesh,
                          const MaterialFaceGroups &usd_face_groups);
 -  void write_uv_maps(const Mesh *mesh, pxr::UsdGeomMesh usd_mesh);
 +  void write_custom_data(const Mesh *mesh, pxr::UsdGeomMesh usd_mesh);
 +  void write_uv_maps(const Mesh *mesh, pxr::UsdGeomMesh usd_mesh, const CustomDataLayer *layer);
 +  void write_vertex_colors(const Mesh *mesh,
 +                           pxr::UsdGeomMesh usd_mesh,
 +                           const CustomDataLayer *layer);
 +  void write_vertex_groups(const Object *ob,
 +                           const Mesh *mesh,
 +                           pxr::UsdGeomMesh usd_mesh,
 +                           bool as_point_groups);
 +  void write_face_maps(const Object *ob, const Mesh *mesh, pxr::UsdGeomMesh usd_mesh);
    void write_normals(const Mesh *mesh, pxr::UsdGeomMesh usd_mesh);
-   void write_surface_velocity(Object *object, const Mesh *mesh, pxr::UsdGeomMesh usd_mesh);
+   void write_surface_velocity(const Mesh *mesh, pxr::UsdGeomMesh usd_mesh);
 +
 + protected:
 +  ModifierData *m_subsurf_mod;
  };
  
  class USDMeshWriter : public USDGenericMeshWriter {