Merge branch 'blender-v3.5-release'

2023-02-21 10:17:13 +01:00
parent c38cac9682 5db40f5747
commit e1b58be9e2
1 changed files with 2 additions and 1 deletions
--- a/source/blender/io/usd/intern/usd_reader_shape.h
+++ b/source/blender/io/usd/intern/usd_reader_shape.h
@@ -53,7 +53,8 @@ class USDShapeReader : public USDGeomReader {
                  const char ** /*err_str*/) override;
  bool is_time_varying();

-  virtual bool topology_changed(const Mesh * /*existing_mesh*/, double /*motionSampleTime*/)
+  virtual bool topology_changed(const Mesh * /*existing_mesh*/,
+                                double /*motionSampleTime*/) override
  {
    return false;
  };