USD Import: snake case for function names.

As part of code cleanup, now using snake case consistently
for class member function names, to match the convention
used in the USD exporter code.

22 files changed, 59 insertions, 59 deletions

diff --git a/source/blender/io/usd/intern/usd_capi.cc b/source/blender/io/usd/intern/usd_capi.cc
index e75f0b013bf..78ad13b9d88 100644
--- a/source/blender/io/usd/intern/usd_capi.cc
+++ b/source/blender/io/usd/intern/usd_capi.cc
@@ -602,8 +602,8 @@ static void import_startjob(void *customdata, short *stop, short *do_update, flo
       }
 
       /* TODO(makowalski): Here and below, should we call
-       *  readObjectData() with the actual time? */
-      reader->readObjectData(data->bmain, 0.0);
+       *  read_object_data() with the actual time? */
+      reader->read_object_data(data->bmain, 0.0);
 
       Object *ob = reader->object();
 
@@ -625,7 +625,7 @@ static void import_startjob(void *customdata, short *stop, short *do_update, flo
     Object *ob = (*iter)->object();
 
     USDPrimReader *reader = (*iter);
-    reader->readObjectData(data->bmain, 0.0);
+    reader->read_object_data(data->bmain, 0.0);
 
     USDPrimReader *parent = (*iter)->parent();
 
diff --git a/source/blender/io/usd/intern/usd_reader_camera.cc b/source/blender/io/usd/intern/usd_reader_camera.cc
index 24adb509413..dc6a1082053 100644
--- a/source/blender/io/usd/intern/usd_reader_camera.cc
+++ b/source/blender/io/usd/intern/usd_reader_camera.cc
@@ -48,7 +48,7 @@ extern "C" {
 
 namespace blender::io::usd {
 
-void USDCameraReader::createObject(Main *bmain, double motionSampleTime)
+void USDCameraReader::create_object(Main *bmain, double motionSampleTime)
 {
   Camera *bcam = static_cast<Camera *>(BKE_camera_add(bmain, m_name.c_str()));
 
@@ -56,7 +56,7 @@ void USDCameraReader::createObject(Main *bmain, double motionSampleTime)
   m_object->data = bcam;
 }
 
-void USDCameraReader::readObjectData(Main *bmain, double motionSampleTime)
+void USDCameraReader::read_object_data(Main *bmain, double motionSampleTime)
 {
   Camera *bcam = (Camera *)m_object->data;
 
@@ -102,7 +102,7 @@ void USDCameraReader::readObjectData(Main *bmain, double motionSampleTime)
     bcam->ortho_scale = max_ff(verAp.Get<float>(), horAp.Get<float>());
   }
 
-  USDXformReader::readObjectData(bmain, motionSampleTime);
+  USDXformReader::read_object_data(bmain, motionSampleTime);
 }
 
 }  // namespace blender::io::usd
diff --git a/source/blender/io/usd/intern/usd_reader_camera.h b/source/blender/io/usd/intern/usd_reader_camera.h
index 29aacf79396..31d4db656a1 100644
--- a/source/blender/io/usd/intern/usd_reader_camera.h
+++ b/source/blender/io/usd/intern/usd_reader_camera.h
@@ -31,8 +31,8 @@ class USDCameraReader : public USDXformReader {
   {
   }
 
-  void createObject(Main *bmain, double motionSampleTime) override;
-  void readObjectData(Main *bmain, double motionSampleTime) override;
+  void create_object(Main *bmain, double motionSampleTime) override;
+  void read_object_data(Main *bmain, double motionSampleTime) override;
 };
 
 }  // namespace blender::io::usd
diff --git a/source/blender/io/usd/intern/usd_reader_curve.cc b/source/blender/io/usd/intern/usd_reader_curve.cc
index 5edc93df5ff..6516870b41f 100644
--- a/source/blender/io/usd/intern/usd_reader_curve.cc
+++ b/source/blender/io/usd/intern/usd_reader_curve.cc
@@ -59,7 +59,7 @@ extern "C" {
 
 namespace blender::io::usd {
 
-void USDCurvesReader::createObject(Main *bmain, double motionSampleTime)
+void USDCurvesReader::create_object(Main *bmain, double motionSampleTime)
 {
   m_curve = BKE_curve_add(bmain, m_name.c_str(), OB_CURVE);
 
@@ -71,16 +71,16 @@ void USDCurvesReader::createObject(Main *bmain, double motionSampleTime)
   m_object->data = m_curve;
 }
 
-void USDCurvesReader::readObjectData(Main *bmain, double motionSampleTime)
+void USDCurvesReader::read_object_data(Main *bmain, double motionSampleTime)
 {
   Curve *cu = (Curve *)m_object->data;
   read_curve_sample(cu, motionSampleTime);
 
   if (curve_prim.GetPointsAttr().ValueMightBeTimeVarying()) {
-    addCacheModifier();
+    add_cache_modifier();
   }
 
-  USDXformReader::readObjectData(bmain, motionSampleTime);
+  USDXformReader::read_object_data(bmain, motionSampleTime);
 }
 
 void USDCurvesReader::read_curve_sample(Curve *cu, double motionSampleTime)
diff --git a/source/blender/io/usd/intern/usd_reader_curve.h b/source/blender/io/usd/intern/usd_reader_curve.h
index a68b6c1d3bc..c805e1b5188 100644
--- a/source/blender/io/usd/intern/usd_reader_curve.h
+++ b/source/blender/io/usd/intern/usd_reader_curve.h
@@ -35,8 +35,8 @@ class USDCurvesReader : public USDGeomReader {
   {
   }
 
-  void createObject(Main *bmain, double motionSampleTime) override;
-  void readObjectData(Main *bmain, double motionSampleTime) override;
+  void create_object(Main *bmain, double motionSampleTime) override;
+  void read_object_data(Main *bmain, double motionSampleTime) override;
 
   void read_curve_sample(Curve *cu, double motionSampleTime);
 
diff --git a/source/blender/io/usd/intern/usd_reader_geom.cc b/source/blender/io/usd/intern/usd_reader_geom.cc
index d81a889905f..8ea3e725391 100644
--- a/source/blender/io/usd/intern/usd_reader_geom.cc
+++ b/source/blender/io/usd/intern/usd_reader_geom.cc
@@ -61,7 +61,7 @@ extern "C" {
 
 namespace blender::io::usd {
 
-void USDGeomReader::createObject(Main *bmain, double motionSampleTime)
+void USDGeomReader::create_object(Main *bmain, double motionSampleTime)
 {
 }
 
@@ -75,7 +75,7 @@ bool USDGeomReader::topology_changed(Mesh *existing_mesh, double motionSampleTim
   return true;
 }
 
-void USDGeomReader::readObjectData(Main *bmain, double motionSampleTime)
+void USDGeomReader::read_object_data(Main *bmain, double motionSampleTime)
 {
 }
 
@@ -88,7 +88,7 @@ Mesh *USDGeomReader::read_mesh(struct Mesh *existing_mesh,
   return nullptr;
 }
 
-void USDGeomReader::addCacheModifier()
+void USDGeomReader::add_cache_modifier()
 {
   ModifierData *md = BKE_modifier_new(eModifierType_MeshSequenceCache);
   BLI_addtail(&m_object->modifiers, md);
@@ -102,7 +102,7 @@ void USDGeomReader::addCacheModifier()
   BLI_strncpy(mcmd->object_path, m_prim.GetPath().GetString().c_str(), FILE_MAX);
 }
 
-void USDGeomReader::addSubdivModifier()
+void USDGeomReader::add_subdiv_modifier()
 {
   ModifierData *md = BKE_modifier_new(eModifierType_Subsurf);
   BLI_addtail(&m_object->modifiers, md);
diff --git a/source/blender/io/usd/intern/usd_reader_geom.h b/source/blender/io/usd/intern/usd_reader_geom.h
index ab83465bf75..01d7a4883dd 100644
--- a/source/blender/io/usd/intern/usd_reader_geom.h
+++ b/source/blender/io/usd/intern/usd_reader_geom.h
@@ -35,8 +35,8 @@ class USDGeomReader : public USDXformReader {
 
   bool valid() const override;
 
-  virtual void createObject(Main *bmain, double motionSampleTime) override;
-  virtual void readObjectData(Main *bmain, double motionSampleTime) override;
+  virtual void create_object(Main *bmain, double motionSampleTime) override;
+  virtual void read_object_data(Main *bmain, double motionSampleTime) override;
 
   virtual Mesh *read_mesh(struct Mesh *existing_mesh,
                           double motionSampleTime,
@@ -44,8 +44,8 @@ class USDGeomReader : public USDXformReader {
                           float vel_scale,
                           const char **err_str);
 
-  void addCacheModifier() override;
-  void addSubdivModifier();
+  void add_cache_modifier() override;
+  void add_subdiv_modifier();
 
   bool topology_changed(Mesh *existing_mesh, double motionSampleTime);
 };
diff --git a/source/blender/io/usd/intern/usd_reader_instance.cc b/source/blender/io/usd/intern/usd_reader_instance.cc
index 60c09a61dc9..4aafd189492 100644
--- a/source/blender/io/usd/intern/usd_reader_instance.cc
+++ b/source/blender/io/usd/intern/usd_reader_instance.cc
@@ -39,7 +39,7 @@ bool USDInstanceReader::valid() const
   return m_prim.IsValid() && m_prim.IsInstance();
 }
 
-void USDInstanceReader::createObject(Main *bmain, double motionSampleTime)
+void USDInstanceReader::create_object(Main *bmain, double motionSampleTime)
 {
   this->m_object = BKE_object_add_only_object(bmain, OB_EMPTY, m_name.c_str());
   this->m_object->data = nullptr;
diff --git a/source/blender/io/usd/intern/usd_reader_instance.h b/source/blender/io/usd/intern/usd_reader_instance.h
index 034ccd8a8dd..ab3cef3aa7b 100644
--- a/source/blender/io/usd/intern/usd_reader_instance.h
+++ b/source/blender/io/usd/intern/usd_reader_instance.h
@@ -38,7 +38,7 @@ class USDInstanceReader : public USDXformReader {
 
   bool valid() const override;
 
-  void createObject(Main *bmain, double motionSampleTime) override;
+  void create_object(Main *bmain, double motionSampleTime) override;
 
   void set_instance_collection(Collection *coll);
 
diff --git a/source/blender/io/usd/intern/usd_reader_light.cc b/source/blender/io/usd/intern/usd_reader_light.cc
index ff2d8dc2514..8a69849a7fe 100644
--- a/source/blender/io/usd/intern/usd_reader_light.cc
+++ b/source/blender/io/usd/intern/usd_reader_light.cc
@@ -58,7 +58,7 @@ extern "C" {
 
 namespace blender::io::usd {
 
-void USDLightReader::createObject(Main *bmain, double motionSampleTime)
+void USDLightReader::create_object(Main *bmain, double motionSampleTime)
 {
   Light *blight = static_cast<Light *>(BKE_light_add(bmain, m_name.c_str()));
 
@@ -66,7 +66,7 @@ void USDLightReader::createObject(Main *bmain, double motionSampleTime)
   m_object->data = blight;
 }
 
-void USDLightReader::readObjectData(Main *bmain, double motionSampleTime)
+void USDLightReader::read_object_data(Main *bmain, double motionSampleTime)
 {
   Light *blight = (Light *)m_object->data;
 
@@ -196,7 +196,7 @@ void USDLightReader::readObjectData(Main *bmain, double motionSampleTime)
       break;
   }
 
-  USDXformReader::readObjectData(bmain, motionSampleTime);
+  USDXformReader::read_object_data(bmain, motionSampleTime);
 }
 
 }  // namespace blender::io::usd
diff --git a/source/blender/io/usd/intern/usd_reader_light.h b/source/blender/io/usd/intern/usd_reader_light.h
index 484133fd6fa..5f64e4b422b 100644
--- a/source/blender/io/usd/intern/usd_reader_light.h
+++ b/source/blender/io/usd/intern/usd_reader_light.h
@@ -31,9 +31,9 @@ class USDLightReader : public USDXformReader {
   {
   }
 
-  void createObject(Main *bmain, double motionSampleTime) override;
+  void create_object(Main *bmain, double motionSampleTime) override;
 
-  void readObjectData(Main *bmain, double motionSampleTime) override;
+  void read_object_data(Main *bmain, double motionSampleTime) override;
 };
 
 }  // namespace blender::io::usd
diff --git a/source/blender/io/usd/intern/usd_reader_mesh.cc b/source/blender/io/usd/intern/usd_reader_mesh.cc
index 15a1a3747e0..4f207d49640 100644
--- a/source/blender/io/usd/intern/usd_reader_mesh.cc
+++ b/source/blender/io/usd/intern/usd_reader_mesh.cc
@@ -198,7 +198,7 @@ USDMeshReader::USDMeshReader(pxr::UsdStageRefPtr stage,
 {
 }
 
-void USDMeshReader::createObject(Main *bmain, double motionSampleTime)
+void USDMeshReader::create_object(Main *bmain, double motionSampleTime)
 {
   Mesh *mesh = BKE_mesh_add(bmain, m_name.c_str());
 
@@ -206,7 +206,7 @@ void USDMeshReader::createObject(Main *bmain, double motionSampleTime)
   m_object->data = mesh;
 }
 
-void USDMeshReader::readObjectData(Main *bmain, double motionSampleTime)
+void USDMeshReader::read_object_data(Main *bmain, double motionSampleTime)
 {
   Mesh *mesh = (Mesh *)m_object->data;
 
@@ -228,7 +228,7 @@ void USDMeshReader::readObjectData(Main *bmain, double motionSampleTime)
     m_isTimeVarying = true;
 
   if (m_isTimeVarying) {
-    addCacheModifier();
+    add_cache_modifier();
   }
 
   if (m_import_params.import_subdiv) {
@@ -236,11 +236,11 @@ void USDMeshReader::readObjectData(Main *bmain, double motionSampleTime)
     mesh_prim.GetSubdivisionSchemeAttr().Get(&subdivScheme, motionSampleTime);
 
     if (subdivScheme == pxr::UsdGeomTokens->catmullClark) {
-      addSubdivModifier();
+      add_subdiv_modifier();
     }
   }
 
-  USDXformReader::readObjectData(bmain, motionSampleTime);
+  USDXformReader::read_object_data(bmain, motionSampleTime);
 }
 
 bool USDMeshReader::valid() const
diff --git a/source/blender/io/usd/intern/usd_reader_mesh.h b/source/blender/io/usd/intern/usd_reader_mesh.h
index aca63cd2fa2..a275d54e26a 100644
--- a/source/blender/io/usd/intern/usd_reader_mesh.h
+++ b/source/blender/io/usd/intern/usd_reader_mesh.h
@@ -33,8 +33,8 @@ class USDMeshReader : public USDGeomReader {
 
   bool valid() const override;
 
-  void createObject(Main *bmain, double motionSampleTime) override;
-  void readObjectData(Main *bmain, double motionSampleTime) override;
+  void create_object(Main *bmain, double motionSampleTime) override;
+  void read_object_data(Main *bmain, double motionSampleTime) override;
 
   struct Mesh *read_mesh(struct Mesh *existing_mesh,
                          double motionSampleTime,
diff --git a/source/blender/io/usd/intern/usd_reader_nurbs.cc b/source/blender/io/usd/intern/usd_reader_nurbs.cc
index e9e244fa4f6..b2800690512 100644
--- a/source/blender/io/usd/intern/usd_reader_nurbs.cc
+++ b/source/blender/io/usd/intern/usd_reader_nurbs.cc
@@ -76,7 +76,7 @@ static bool set_knots(const pxr::VtDoubleArray &knots, float *&nu_knots)
 
 namespace blender::io::usd {
 
-void USDNurbsReader::createObject(Main *bmain, double motionSampleTime)
+void USDNurbsReader::create_object(Main *bmain, double motionSampleTime)
 {
   m_curve = BKE_curve_add(bmain, m_name.c_str(), OB_CURVE);
 
@@ -88,16 +88,16 @@ void USDNurbsReader::createObject(Main *bmain, double motionSampleTime)
   m_object->data = m_curve;
 }
 
-void USDNurbsReader::readObjectData(Main *bmain, double motionSampleTime)
+void USDNurbsReader::read_object_data(Main *bmain, double motionSampleTime)
 {
   Curve *cu = (Curve *)m_object->data;
   read_curve_sample(cu, motionSampleTime);
 
   if (curve_prim.GetPointsAttr().ValueMightBeTimeVarying()) {
-    addCacheModifier();
+    add_cache_modifier();
   }
 
-  USDXformReader::readObjectData(bmain, motionSampleTime);
+  USDXformReader::read_object_data(bmain, motionSampleTime);
 }
 
 void USDNurbsReader::read_curve_sample(Curve *cu, double motionSampleTime)
diff --git a/source/blender/io/usd/intern/usd_reader_nurbs.h b/source/blender/io/usd/intern/usd_reader_nurbs.h
index b38c3090e4d..53e52d65293 100644
--- a/source/blender/io/usd/intern/usd_reader_nurbs.h
+++ b/source/blender/io/usd/intern/usd_reader_nurbs.h
@@ -35,8 +35,8 @@ class USDNurbsReader : public USDGeomReader {
   {
   }
 
-  void createObject(Main *bmain, double motionSampleTime) override;
-  void readObjectData(Main *bmain, double motionSampleTime) override;
+  void create_object(Main *bmain, double motionSampleTime) override;
+  void read_object_data(Main *bmain, double motionSampleTime) override;
 
   void read_curve_sample(Curve *cu, double motionSampleTime);
 
diff --git a/source/blender/io/usd/intern/usd_reader_prim.cc b/source/blender/io/usd/intern/usd_reader_prim.cc
index e0b484aef90..98e32c61e8c 100644
--- a/source/blender/io/usd/intern/usd_reader_prim.cc
+++ b/source/blender/io/usd/intern/usd_reader_prim.cc
@@ -81,18 +81,18 @@ bool USDPrimReader::valid() const
   return m_prim.IsValid();
 }
 
-void USDPrimReader::createObject(Main *bmain, double motionSampleTime)
+void USDPrimReader::create_object(Main *bmain, double motionSampleTime)
 {
   m_object = BKE_object_add_only_object(bmain, OB_EMPTY, m_name.c_str());
   m_object->empty_drawsize = 0.1f;
   m_object->data = NULL;
 }
 
-void USDPrimReader::readObjectData(Main *bmain, double motionSampleTime)
+void USDPrimReader::read_object_data(Main *bmain, double motionSampleTime)
 {
 }
 
-void USDPrimReader::addCacheModifier()
+void USDPrimReader::add_cache_modifier()
 {
 }
 
diff --git a/source/blender/io/usd/intern/usd_reader_prim.h b/source/blender/io/usd/intern/usd_reader_prim.h
index b78f9dbad2a..da96783a9dc 100644
--- a/source/blender/io/usd/intern/usd_reader_prim.h
+++ b/source/blender/io/usd/intern/usd_reader_prim.h
@@ -104,8 +104,8 @@ class USDPrimReader {
 
   virtual bool valid() const;
 
-  virtual void createObject(Main *bmain, double motionSampleTime);
-  virtual void readObjectData(Main *bmain, double motionSampleTime);
+  virtual void create_object(Main *bmain, double motionSampleTime);
+  virtual void read_object_data(Main *bmain, double motionSampleTime);
 
   Object *object() const;
   void object(Object *ob);
@@ -123,7 +123,7 @@ class USDPrimReader {
   void incref();
   void decref();
 
-  virtual void addCacheModifier();
+  virtual void add_cache_modifier();
 
   const std::string &name() const
   {
diff --git a/source/blender/io/usd/intern/usd_reader_stage.cc b/source/blender/io/usd/intern/usd_reader_stage.cc
index 5424c410a07..11ea7e1ab93 100644
--- a/source/blender/io/usd/intern/usd_reader_stage.cc
+++ b/source/blender/io/usd/intern/usd_reader_stage.cc
@@ -144,7 +144,7 @@ static USDPrimReader *_handlePrim(Main *bmain,
       return NULL;
 
     reader->parent(parent_reader);
-    reader->createObject(bmain, 0.0);
+    reader->create_object(bmain, 0.0);
 
     readers.push_back(reader);
     reader->incref();
diff --git a/source/blender/io/usd/intern/usd_reader_volume.cc b/source/blender/io/usd/intern/usd_reader_volume.cc
index a4fc9010008..b68edf80323 100644
--- a/source/blender/io/usd/intern/usd_reader_volume.cc
+++ b/source/blender/io/usd/intern/usd_reader_volume.cc
@@ -56,7 +56,7 @@ extern "C" {
 
 namespace blender::io::usd {
 
-void USDVolumeReader::createObject(Main *bmain, double motionSampleTime)
+void USDVolumeReader::create_object(Main *bmain, double motionSampleTime)
 {
   Volume *volume = (Volume *)BKE_volume_add(bmain, m_name.c_str());
   id_us_min(&volume->id);
@@ -65,7 +65,7 @@ void USDVolumeReader::createObject(Main *bmain, double motionSampleTime)
   m_object->data = volume;
 }
 
-void USDVolumeReader::readObjectData(Main *bmain, double motionSampleTime)
+void USDVolumeReader::read_object_data(Main *bmain, double motionSampleTime)
 {
   m_volume = pxr::UsdVolVolume::Get(m_stage, m_prim.GetPath());
 
@@ -121,7 +121,7 @@ void USDVolumeReader::readObjectData(Main *bmain, double motionSampleTime)
     }
   }
 
-  USDXformReader::readObjectData(bmain, motionSampleTime);
+  USDXformReader::read_object_data(bmain, motionSampleTime);
 }
 
 }  // namespace blender::io::usd
diff --git a/source/blender/io/usd/intern/usd_reader_volume.h b/source/blender/io/usd/intern/usd_reader_volume.h
index 18ca3deaf51..3968956b6b0 100644
--- a/source/blender/io/usd/intern/usd_reader_volume.h
+++ b/source/blender/io/usd/intern/usd_reader_volume.h
@@ -33,8 +33,8 @@ class USDVolumeReader : public USDXformReader {
   {
   }
 
-  void createObject(Main *bmain, double motionSampleTime) override;
-  void readObjectData(Main *bmain, double motionSampleTime) override;
+  void create_object(Main *bmain, double motionSampleTime) override;
+  void read_object_data(Main *bmain, double motionSampleTime) override;
 
   pxr::UsdVolVolume m_volume;
 };
diff --git a/source/blender/io/usd/intern/usd_reader_xform.cc b/source/blender/io/usd/intern/usd_reader_xform.cc
index 00d700dfa29..52221be4040 100644
--- a/source/blender/io/usd/intern/usd_reader_xform.cc
+++ b/source/blender/io/usd/intern/usd_reader_xform.cc
@@ -48,16 +48,16 @@ extern "C" {
 
 namespace blender::io::usd {
 
-void USDXformReader::createObject(Main *bmain, double motionSampleTime)
+void USDXformReader::create_object(Main *bmain, double motionSampleTime)
 {
   m_object = BKE_object_add_only_object(bmain, OB_EMPTY, m_name.c_str());
   m_object->empty_drawsize = 0.1f;
   m_object->data = NULL;
 }
 
-void USDXformReader::readObjectData(Main *bmain, double motionSampleTime)
+void USDXformReader::read_object_data(Main *bmain, double motionSampleTime)
 {
-  USDPrimReader::readObjectData(bmain, motionSampleTime);
+  USDPrimReader::read_object_data(bmain, motionSampleTime);
 
   bool is_constant;
   float transform_from_usd[4][4];
diff --git a/source/blender/io/usd/intern/usd_reader_xform.h b/source/blender/io/usd/intern/usd_reader_xform.h
index 5a526f6ad4d..88b2d94361d 100644
--- a/source/blender/io/usd/intern/usd_reader_xform.h
+++ b/source/blender/io/usd/intern/usd_reader_xform.h
@@ -31,8 +31,8 @@ class USDXformReader : public USDPrimReader {
   {
   }
 
-  void createObject(Main *bmain, double motionSampleTime) override;
-  void readObjectData(Main *bmain, double motionSampleTime) override;
+  void create_object(Main *bmain, double motionSampleTime) override;
+  void read_object_data(Main *bmain, double motionSampleTime) override;
 
   void read_matrix(float r_mat[4][4], const float time, const float scale, bool &is_constant);