[Bf-blender-cvs] [bc31ff9c24a] usd-importer-T81257-merge: USD import: remove extern C directive.

[makowalski]

Commit: bc31ff9c24acc000d680a3eaa1628da5a5071536
Author: makowalski
Date:   Sun Jul 18 20:19:13 2021 -0400
Branches: usd-importer-T81257-merge
https://developer.blender.org/rBbc31ff9c24acc000d680a3eaa1628da5a5071536

USD import: remove extern C directive.

Removed unneeded extern C directive around includes,
per suggestion from Hans Goudey in his review of
the USD importer patch.

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

M	source/blender/io/usd/intern/usd_reader_camera.cc
M	source/blender/io/usd/intern/usd_reader_curve.cc
M	source/blender/io/usd/intern/usd_reader_geom.cc
M	source/blender/io/usd/intern/usd_reader_light.cc
M	source/blender/io/usd/intern/usd_reader_mesh.cc
M	source/blender/io/usd/intern/usd_reader_nurbs.cc
M	source/blender/io/usd/intern/usd_reader_prim.cc
M	source/blender/io/usd/intern/usd_reader_prim.h
M	source/blender/io/usd/intern/usd_reader_xform.cc

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

diff --git a/source/blender/io/usd/intern/usd_reader_camera.cc b/source/blender/io/usd/intern/usd_reader_camera.cc
index 129532b3e38..3458ffadf5f 100644
--- a/source/blender/io/usd/intern/usd_reader_camera.cc
+++ b/source/blender/io/usd/intern/usd_reader_camera.cc
@@ -17,7 +17,6 @@
 #include "usd_reader_camera.h"
 #include "usd_reader_prim.h"
 
-extern "C" {
 #include "DNA_cachefile_types.h"
 #include "DNA_camera_types.h"
 #include "DNA_constraint_types.h"
@@ -38,7 +37,6 @@ extern "C" {
 
 #include "WM_api.h"
 #include "WM_types.h"
-}
 
 #include <pxr/pxr.h>
 #include <pxr/usd/usd/prim.h>
diff --git a/source/blender/io/usd/intern/usd_reader_curve.cc b/source/blender/io/usd/intern/usd_reader_curve.cc
index 28e2abbdcb4..8ee495f8df4 100644
--- a/source/blender/io/usd/intern/usd_reader_curve.cc
+++ b/source/blender/io/usd/intern/usd_reader_curve.cc
@@ -18,7 +18,7 @@
 #include "usd_reader_prim.h"
 
 #include "MEM_guardedalloc.h"
-extern "C" {
+
 #include "DNA_cachefile_types.h"
 #include "DNA_camera_types.h"
 #include "DNA_constraint_types.h"
@@ -43,7 +43,6 @@ extern "C" {
 
 #include "WM_api.h"
 #include "WM_types.h"
-}
 
 #include <pxr/base/vt/array.h>
 #include <pxr/base/vt/types.h>
diff --git a/source/blender/io/usd/intern/usd_reader_geom.cc b/source/blender/io/usd/intern/usd_reader_geom.cc
index 855d4c409fa..e1bf17dc3fc 100644
--- a/source/blender/io/usd/intern/usd_reader_geom.cc
+++ b/source/blender/io/usd/intern/usd_reader_geom.cc
@@ -18,7 +18,7 @@
 #include "usd_reader_prim.h"
 
 #include "MEM_guardedalloc.h"
-extern "C" {
+
 #include "DNA_cachefile_types.h"
 #include "DNA_camera_types.h"
 #include "DNA_constraint_types.h"
@@ -46,7 +46,6 @@ extern "C" {
 
 #include "WM_api.h"
 #include "WM_types.h"
-}
 
 #include <pxr/base/vt/array.h>
 #include <pxr/base/vt/types.h>
diff --git a/source/blender/io/usd/intern/usd_reader_light.cc b/source/blender/io/usd/intern/usd_reader_light.cc
index 7db02a42068..20b0adcd245 100644
--- a/source/blender/io/usd/intern/usd_reader_light.cc
+++ b/source/blender/io/usd/intern/usd_reader_light.cc
@@ -16,7 +16,6 @@
 
 #include "usd_reader_light.h"
 
-extern "C" {
 #include "DNA_light_types.h"
 #include "DNA_object_types.h"
 
@@ -25,7 +24,6 @@ extern "C" {
 
 #include "WM_api.h"
 #include "WM_types.h"
-}
 
 #include <pxr/pxr.h>
 #include <pxr/usd/usd/prim.h>
diff --git a/source/blender/io/usd/intern/usd_reader_mesh.cc b/source/blender/io/usd/intern/usd_reader_mesh.cc
index 2ca8d174775..1340483ec68 100644
--- a/source/blender/io/usd/intern/usd_reader_mesh.cc
+++ b/source/blender/io/usd/intern/usd_reader_mesh.cc
@@ -19,7 +19,7 @@
 #include "usd_reader_prim.h"
 
 #include "MEM_guardedalloc.h"
-extern "C" {
+
 #include "DNA_cachefile_types.h"
 #include "DNA_camera_types.h"
 #include "DNA_constraint_types.h"
@@ -50,7 +50,6 @@ extern "C" {
 
 #include "WM_api.h"
 #include "WM_types.h"
-}
 
 #include <pxr/base/vt/array.h>
 #include <pxr/base/vt/types.h>
diff --git a/source/blender/io/usd/intern/usd_reader_nurbs.cc b/source/blender/io/usd/intern/usd_reader_nurbs.cc
index e36c3a277d7..26d586796c6 100644
--- a/source/blender/io/usd/intern/usd_reader_nurbs.cc
+++ b/source/blender/io/usd/intern/usd_reader_nurbs.cc
@@ -18,7 +18,7 @@
 #include "usd_reader_prim.h"
 
 #include "MEM_guardedalloc.h"
-extern "C" {
+
 #include "DNA_cachefile_types.h"
 #include "DNA_camera_types.h"
 #include "DNA_constraint_types.h"
@@ -43,7 +43,6 @@ extern "C" {
 
 #include "WM_api.h"
 #include "WM_types.h"
-}
 
 #include <pxr/base/vt/array.h>
 #include <pxr/base/vt/types.h>
diff --git a/source/blender/io/usd/intern/usd_reader_prim.cc b/source/blender/io/usd/intern/usd_reader_prim.cc
index 87bc69f764b..82c3bae8b81 100644
--- a/source/blender/io/usd/intern/usd_reader_prim.cc
+++ b/source/blender/io/usd/intern/usd_reader_prim.cc
@@ -16,7 +16,6 @@
 
 #include "usd_reader_prim.h"
 
-extern "C" {
 #include "DNA_cachefile_types.h"
 #include "DNA_constraint_types.h"
 #include "DNA_modifier_types.h"
@@ -34,7 +33,6 @@ extern "C" {
 
 #include "WM_api.h"
 #include "WM_types.h"
-}
 
 namespace blender::io::usd {
 
diff --git a/source/blender/io/usd/intern/usd_reader_prim.h b/source/blender/io/usd/intern/usd_reader_prim.h
index d5f90cdd8a1..c68977e6432 100644
--- a/source/blender/io/usd/intern/usd_reader_prim.h
+++ b/source/blender/io/usd/intern/usd_reader_prim.h
@@ -25,9 +25,7 @@
 
 #include <vector>
 
-extern "C" {
 #include "DNA_ID.h"
-}
 
 struct CacheFile;
 struct Main;
diff --git a/source/blender/io/usd/intern/usd_reader_xform.cc b/source/blender/io/usd/intern/usd_reader_xform.cc
index 241ae4b7011..9a43faada9a 100644
--- a/source/blender/io/usd/intern/usd_reader_xform.cc
+++ b/source/blender/io/usd/intern/usd_reader_xform.cc
@@ -17,7 +17,6 @@
 #include "usd_reader_xform.h"
 #include "usd_reader_prim.h"
 
-extern "C" {
 #include "DNA_cachefile_types.h"
 #include "DNA_constraint_types.h"
 #include "DNA_modifier_types.h"
@@ -36,7 +35,6 @@ extern "C" {
 
 #include "WM_api.h"
 #include "WM_types.h"
-}
 
 #include <pxr/base/gf/math.h>
 #include <pxr/base/gf/matrix4f.h>