USD Import: use pragma once in headers.

Replaced include guards with pragma once directives,
to conform to the conventions used in the existing USD
export code.

11 files changed, 15 insertions, 93 deletions

diff --git a/source/blender/io/usd/intern/usd_reader_camera.h b/source/blender/io/usd/intern/usd_reader_camera.h
index ac749ca2a4c..93a381c5ee8 100644
--- a/source/blender/io/usd/intern/usd_reader_camera.h
+++ b/source/blender/io/usd/intern/usd_reader_camera.h
@@ -13,13 +13,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-
-/** \file
- * \ingroup busd
- */
-
-#ifndef __USD_READER_CAMERA_H__
-#define __USD_READER_CAMERA_H__
+#pragma once
 
 #include "usd.h"
 #include "usd_reader_xform.h"
@@ -38,5 +32,3 @@ class USDCameraReader : public USDXformReader {
   void createObject(Main *bmain, double motionSampleTime) override;
   void readObjectData(Main *bmain, double motionSampleTime) override;
 };
-
-#endif /* __USD_READER_CAMERA_H__ */
diff --git a/source/blender/io/usd/intern/usd_reader_curve.h b/source/blender/io/usd/intern/usd_reader_curve.h
index 1db69f91976..cf57677d416 100644
--- a/source/blender/io/usd/intern/usd_reader_curve.h
+++ b/source/blender/io/usd/intern/usd_reader_curve.h
@@ -13,13 +13,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-
-/** \file
- * \ingroup busd
- */
-
-#ifndef __USD_READER_CURVES_H__
-#define __USD_READER_CURVES_H__
+#pragma once
 
 #include "usd.h"
 #include "usd_reader_geom.h"
@@ -54,5 +48,3 @@ class USDCurvesReader : public USDGeomReader {
   pxr::UsdGeomBasisCurves curve_prim;
   Curve *m_curve;
 };
-
-#endif /* __USD_READER_CURVES_H__ */
diff --git a/source/blender/io/usd/intern/usd_reader_geom.h b/source/blender/io/usd/intern/usd_reader_geom.h
index 4370b24f311..fef7aca88ee 100644
--- a/source/blender/io/usd/intern/usd_reader_geom.h
+++ b/source/blender/io/usd/intern/usd_reader_geom.h
@@ -13,13 +13,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-
-/** \file
- * \ingroup busd
- */
-
-#ifndef __USD_READER_GEOM_H__
-#define __USD_READER_GEOM_H__
+#pragma once
 
 #include "usd.h"
 #include "usd_reader_xform.h"
@@ -53,5 +47,3 @@ class USDGeomReader : public USDXformReader {
 
   bool topology_changed(Mesh *existing_mesh, double motionSampleTime);
 };
-
-#endif /* __USD_READER_GEOM_H__ */
diff --git a/source/blender/io/usd/intern/usd_reader_light.h b/source/blender/io/usd/intern/usd_reader_light.h
index bc8b4301ead..b83886767ac 100644
--- a/source/blender/io/usd/intern/usd_reader_light.h
+++ b/source/blender/io/usd/intern/usd_reader_light.h
@@ -13,16 +13,17 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
+#pragma once
 
 /** \file
  * \ingroup busd
  */
 
 #ifndef __USD_READER_LIGHT_H__
-#define __USD_READER_LIGHT_H__
+#  define __USD_READER_LIGHT_H__
 
-#include "usd.h"
-#include "usd_reader_xform.h"
+#  include "usd.h"
+#  include "usd_reader_xform.h"
 
 class USDLightReader : public USDXformReader {
 
diff --git a/source/blender/io/usd/intern/usd_reader_mesh.h b/source/blender/io/usd/intern/usd_reader_mesh.h
index 683be456aad..35f486b9904 100644
--- a/source/blender/io/usd/intern/usd_reader_mesh.h
+++ b/source/blender/io/usd/intern/usd_reader_mesh.h
@@ -13,13 +13,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-
-/** \file
- * \ingroup busd
- */
-
-#ifndef __USD_READER_MESH_H__
-#define __USD_READER_MESH_H__
+#pragma once
 
 #include "pxr/usd/usdGeom/mesh.h"
 #include "usd.h"
@@ -96,5 +90,3 @@ class USDMeshReader : public USDGeomReader {
   // implemented. Note this will break if face or positions vary...
   bool m_isInitialLoad;
 };
-
-#endif /* __USD_READER_MESH_H__ */
diff --git a/source/blender/io/usd/intern/usd_reader_nurbs.h b/source/blender/io/usd/intern/usd_reader_nurbs.h
index 4849c02c38c..c86860d0929 100644
--- a/source/blender/io/usd/intern/usd_reader_nurbs.h
+++ b/source/blender/io/usd/intern/usd_reader_nurbs.h
@@ -13,13 +13,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-
-/** \file
- * \ingroup busd
- */
-
-#ifndef __USD_READER_NURBS_H__
-#define __USD_READER_NURBS_H__
+#pragma once
 
 #include "usd.h"
 #include "usd_reader_geom.h"
@@ -54,5 +48,3 @@ class USDNurbsReader : public USDGeomReader {
   pxr::UsdGeomNurbsCurves curve_prim;
   Curve *m_curve;
 };
-
-#endif /* __USD_READER_NURBS_H__ */
diff --git a/source/blender/io/usd/intern/usd_reader_prim.h b/source/blender/io/usd/intern/usd_reader_prim.h
index 5534458f7cc..c60a63f15d1 100644
--- a/source/blender/io/usd/intern/usd_reader_prim.h
+++ b/source/blender/io/usd/intern/usd_reader_prim.h
@@ -13,13 +13,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-
-/** \file
- * \ingroup busd
- */
-
-#ifndef __USD_READER_OBJECT_H__
-#define __USD_READER_OBJECT_H__
+#pragma once
 
 #include "usd.h"
 
@@ -138,5 +132,3 @@ class USDPrimReader {
     return m_prim_path;
   }
 };
-
-#endif /* __USD_READER_OBJECT_H__ */
diff --git a/source/blender/io/usd/intern/usd_reader_stage.h b/source/blender/io/usd/intern/usd_reader_stage.h
index bd4a7fb85b9..3a3340b51ee 100644
--- a/source/blender/io/usd/intern/usd_reader_stage.h
+++ b/source/blender/io/usd/intern/usd_reader_stage.h
@@ -16,13 +16,7 @@
  * The Original Code is Copyright (C) 2016 Kévin Dietrich.
  * All rights reserved.
  */
-
-/** \file
- * \ingroup busd
- */
-
-#ifndef __USD_READER_ARCHIVE_H__
-#define __USD_READER_ARCHIVE_H__
+#pragma once
 
 struct Main;
 struct Scene;
@@ -102,5 +96,3 @@ class USDStageReader {
 };
 
 };  // namespace blender::io::usd
-
-#endif /* __USD_READER_ARCHIVE_H__ */
diff --git a/source/blender/io/usd/intern/usd_reader_volume.h b/source/blender/io/usd/intern/usd_reader_volume.h
index 773b5f43279..ea2af08b825 100644
--- a/source/blender/io/usd/intern/usd_reader_volume.h
+++ b/source/blender/io/usd/intern/usd_reader_volume.h
@@ -13,13 +13,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-
-/** \file
- * \ingroup busd
- */
-
-#ifndef __USD_READER_VOLUME_H__
-#define __USD_READER_VOLUME_H__
+#pragma once
 
 #include "usd.h"
 #include "usd_reader_xform.h"
@@ -42,5 +36,3 @@ class USDVolumeReader : public USDXformReader {
 
   pxr::UsdVolVolume m_volume;
 };
-
-#endif /* __USD_READER_VOLUME_H__ */
diff --git a/source/blender/io/usd/intern/usd_reader_xform.h b/source/blender/io/usd/intern/usd_reader_xform.h
index 6899722ee4a..bab955cf3d3 100644
--- a/source/blender/io/usd/intern/usd_reader_xform.h
+++ b/source/blender/io/usd/intern/usd_reader_xform.h
@@ -13,13 +13,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-
-/** \file
- * \ingroup busd
- */
-
-#ifndef __USD_READER_XFORM_H__
-#define __USD_READER_XFORM_H__
+#pragma once
 
 #include "usd.h"
 #include "usd_reader_prim.h"
@@ -44,5 +38,3 @@ class USDXformReader : public USDPrimReader {
   // transform hierarchy.
   bool is_root_xform_object() const;
 };
-
-#endif /* __USD_READER_XFORM_H__ */
diff --git a/source/blender/io/usd/intern/usd_util.h b/source/blender/io/usd/intern/usd_util.h
index 68b2b6d2ed7..0e7f75a80ba 100644
--- a/source/blender/io/usd/intern/usd_util.h
+++ b/source/blender/io/usd/intern/usd_util.h
@@ -13,13 +13,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
-
-/** \file
- * \ingroup busd
- */
-
-#ifndef __USD_UTIL_H__
-#define __USD_UTIL_H__
+#pragma once
 
 #include <string>
 
@@ -52,8 +46,7 @@ USDPrimReader *create_reader(const pxr::UsdStageRefPtr &stage,
                              const pxr::UsdPrim &prim,
                              const USDImportParams &params,
                              ImportSettings &settings);
+
 USDPrimReader *create_fake_reader(class USDStageReader *archive, const pxr::UsdPrim &prim);
 
 }  // Namespace blender::io::usd
-
-#endif /* __USD_UTIL_H__ */