From ef8c44e66b2f20c3605c0c46f15e06c03f323291 Mon Sep 17 00:00:00 2001 From: c64kernal Date: Tue, 14 Jan 2020 17:14:01 -0800 Subject: [PATCH] A refresh for all the pch files in pxr. Fixes #1006 Fixes #785 (Internal change: 2034642) --- extras/usd/examples/usdObj/pch.h | 35 +--- extras/usd/examples/usdSchemaExamples/pch.h | 35 +--- pxr/base/arch/pch.h | 7 +- pxr/base/gf/pch.h | 21 +-- pxr/base/js/pch.h | 4 +- pxr/base/plug/pch.h | 24 +-- pxr/base/tf/pch.h | 27 ++- pxr/base/trace/pch.h | 36 ++-- pxr/base/vt/pch.h | 28 ++- pxr/base/work/pch.h | 14 +- pxr/imaging/cameraUtil/pch.h | 19 +- pxr/imaging/garch/pch.h | 26 ++- pxr/imaging/glf/pch.h | 44 ++--- pxr/imaging/hd/pch.h | 39 ++--- pxr/imaging/hdSt/pch.h | 39 +++-- pxr/imaging/hdx/pch.h | 33 ++-- pxr/imaging/hf/pch.h | 43 +---- pxr/imaging/hgiGL/pch.h | 2 +- pxr/imaging/hio/pch.h | 9 +- pxr/imaging/plugin/hdEmbree/pch.h | 37 ++-- pxr/imaging/plugin/hdStorm/pch.h | 50 +++++- pxr/imaging/pxOsd/pch.h | 40 +++-- pxr/usd/ar/pch.h | 48 +++-- pxr/usd/kind/pch.h | 16 +- pxr/usd/ndr/pch.h | 46 ++--- pxr/usd/pcp/pch.h | 46 ++--- pxr/usd/plugin/sdrOsl/pch.h | 24 +-- pxr/usd/plugin/usdAbc/pch.h | 34 +--- pxr/usd/plugin/usdDraco/pch.h | 48 ++--- pxr/usd/plugin/usdMtlx/pch.h | 32 ++-- pxr/usd/sdf/pch.h | 45 +++-- pxr/usd/sdr/pch.h | 27 +-- pxr/usd/usd/pch.h | 43 ++--- pxr/usd/usdGeom/pch.h | 41 ++--- pxr/usd/usdHydra/pch.h | 41 +---- pxr/usd/usdLux/pch.h | 34 +--- pxr/usd/usdMedia/pch.h | 2 +- pxr/usd/usdRender/pch.h | 2 +- pxr/usd/usdRi/pch.h | 35 +--- pxr/usd/usdShade/pch.h | 42 ++--- pxr/usd/usdSkel/pch.h | 49 +++--- pxr/usd/usdUI/pch.h | 35 +--- pxr/usd/usdUtils/pch.h | 49 +++--- pxr/usd/usdVol/pch.h | 45 +---- pxr/usdImaging/plugin/sdrGlslfx/pch.h | 59 +------ pxr/usdImaging/plugin/usdShaders/pch.h | 24 +-- pxr/usdImaging/usdAppUtils/pch.h | 43 ++--- pxr/usdImaging/usdImaging/pch.h | 57 +++--- pxr/usdImaging/usdImagingGL/pch.h | 36 +--- pxr/usdImaging/usdRiImaging/pch.h | 165 +++++++++++++++++- pxr/usdImaging/usdSkelImaging/pch.h | 38 ++-- pxr/usdImaging/usdVolImaging/pch.h | 81 ++++++++- pxr/usdImaging/usdviewq/pch.h | 36 +--- .../renderman-22/plugin/rmanArgsParser/pch.h | 25 +-- .../renderman-23/plugin/rmanArgsParser/pch.h | 25 +-- 55 files changed, 864 insertions(+), 1121 deletions(-) diff --git a/extras/usd/examples/usdObj/pch.h b/extras/usd/examples/usdObj/pch.h index 7925f1f289..6a8744cbc7 100644 --- a/extras/usd/examples/usdObj/pch.h +++ b/extras/usd/examples/usdObj/pch.h @@ -47,6 +47,7 @@ #include #include #include +#include #include #include #include @@ -54,20 +55,22 @@ #include #include #include +#include #include #include #include #include -#include #include #include #include #include #include +#include #include #include #include #include +#include #include #include #include @@ -75,6 +78,7 @@ #include #include #include +#include #include #include #include @@ -86,8 +90,6 @@ #include #include #include -#include -#include #include #include #include @@ -99,23 +101,12 @@ #include #include #include -#include -#include -#include -#include #include -#include -#include -#include #include -#include -#include -#include -#include #include #include #include -#include +#include #include #include #include @@ -124,7 +115,6 @@ #include #include #include -#include #include #include #include @@ -159,33 +149,26 @@ #endif #endif // PXR_PYTHON_SUPPORT_ENABLED #include -#include #include -#include -#include #include -#include #include #include #include #include #include -#include #include #include #include -#include #include -#include #include #include #include #include #include -#include #include #include -#include +#include +#include #include #include #include @@ -194,5 +177,5 @@ #include #include #ifdef PXR_PYTHON_SUPPORT_ENABLED -#include +#include "pxr/base/tf/pySafePython.h" #endif // PXR_PYTHON_SUPPORT_ENABLED diff --git a/extras/usd/examples/usdSchemaExamples/pch.h b/extras/usd/examples/usdSchemaExamples/pch.h index c99c6dac65..47666439a2 100644 --- a/extras/usd/examples/usdSchemaExamples/pch.h +++ b/extras/usd/examples/usdSchemaExamples/pch.h @@ -46,6 +46,7 @@ #include #include #include +#include #include #include #include @@ -57,9 +58,7 @@ #include #include #include -#include #include -#include #include #include #include @@ -68,6 +67,7 @@ #include #include #include +#include #include #include #include @@ -75,6 +75,7 @@ #include #include #include +#include #include #include #include @@ -86,8 +87,6 @@ #include #include #include -#include -#include #include #include #include @@ -97,23 +96,12 @@ #include #include #include -#include -#include -#include -#include #include -#include -#include -#include #include -#include -#include -#include -#include #include #include #include -#include +#include #include #include #include @@ -122,7 +110,6 @@ #include #include #include -#include #include #include #include @@ -155,7 +142,6 @@ #include #include #include -#include #include #include #include @@ -165,33 +151,26 @@ #endif #endif // PXR_PYTHON_SUPPORT_ENABLED #include -#include #include -#include -#include #include #include -#include #include #include #include #include #include -#include #include #include #include -#include #include -#include #include #include #include #include #include -#include #include -#include +#include +#include #include #include #include @@ -200,5 +179,5 @@ #include #include #ifdef PXR_PYTHON_SUPPORT_ENABLED -#include +#include "pxr/base/tf/pySafePython.h" #endif // PXR_PYTHON_SUPPORT_ENABLED diff --git a/pxr/base/arch/pch.h b/pxr/base/arch/pch.h index 0e690b62ff..e12a42b037 100644 --- a/pxr/base/arch/pch.h +++ b/pxr/base/arch/pch.h @@ -67,6 +67,7 @@ #include #include +#include #include #include #include @@ -78,7 +79,9 @@ #endif #include #include +#include #include +#include #include #include #include @@ -91,19 +94,18 @@ #include #include #include -#include #include #include #include #include #include +#include #include #include #include #include #include #include -#include #include #include #include @@ -114,4 +116,5 @@ #include #include #include +#include #include diff --git a/pxr/base/gf/pch.h b/pxr/base/gf/pch.h index 3a52ee8443..13f35f9775 100644 --- a/pxr/base/gf/pch.h +++ b/pxr/base/gf/pch.h @@ -41,6 +41,7 @@ #include #include #include +#include #include #include #include @@ -49,15 +50,19 @@ #include #include #include -#include +#include +#include #include -#include +#include +#include #include #include +#include #include #include #include #include +#include #include #include #include @@ -73,20 +78,12 @@ #include #include #include -#include #include #include -#include -#include -#include #include #include -#include -#include -#include #include #include -#include #include #include #include @@ -140,10 +137,8 @@ #undef toupper #endif #endif // PXR_PYTHON_SUPPORT_ENABLED -#include #include #include -#include #include #include #include @@ -151,5 +146,5 @@ #include #include #ifdef PXR_PYTHON_SUPPORT_ENABLED -#include +#include "pxr/base/tf/pySafePython.h" #endif // PXR_PYTHON_SUPPORT_ENABLED diff --git a/pxr/base/js/pch.h b/pxr/base/js/pch.h index 654e6b65d2..00eaef7f70 100644 --- a/pxr/base/js/pch.h +++ b/pxr/base/js/pch.h @@ -38,20 +38,20 @@ #endif #include #include +#include #include #include #include -#include #include #include #include +#include #include #include #include #include #include #include -#include #include #include #include diff --git a/pxr/base/plug/pch.h b/pxr/base/plug/pch.h index b91d1b55f3..98b6fc7825 100644 --- a/pxr/base/plug/pch.h +++ b/pxr/base/plug/pch.h @@ -56,6 +56,7 @@ #endif #include #include +#include #include #include #include @@ -67,14 +68,16 @@ #include #include #include -#include +#include #include #include #include +#include #include #include #include #include +#include #include #include #include @@ -98,18 +101,12 @@ #include #include #include -#include -#include -#include #include #include -#include -#include #include #include #include #include -#include #include #include #include @@ -119,11 +116,17 @@ #include #include #include +#include #include #include #include #include #include +#include +#include +#include +#include +#include #include #include #include @@ -170,21 +173,18 @@ #endif #endif // PXR_PYTHON_SUPPORT_ENABLED #include -#include -#include #include #include #include -#include #include #include #include -#include #include #include #include #include #include +#include #include #include #include @@ -192,5 +192,5 @@ #include #include #ifdef PXR_PYTHON_SUPPORT_ENABLED -#include +#include "pxr/base/tf/pySafePython.h" #endif // PXR_PYTHON_SUPPORT_ENABLED diff --git a/pxr/base/tf/pch.h b/pxr/base/tf/pch.h index 9ead76f8e9..11cb840f30 100644 --- a/pxr/base/tf/pch.h +++ b/pxr/base/tf/pch.h @@ -68,6 +68,8 @@ #include #include #include +#include +#include #include #include #include @@ -83,6 +85,7 @@ #include #include #include +#include #include #include #include @@ -127,17 +130,9 @@ #include #include #include -#include -#include -#include #include -#include #include -#include -#include #include -#include -#include #include #include #include @@ -151,11 +146,17 @@ #include #include #include +#include #include #include #include #include #include +#include +#include +#include +#include +#include #include #include #include @@ -190,10 +191,8 @@ #include #include #include -#include #include #include -#include #include #include #include @@ -226,18 +225,15 @@ #undef toupper #endif #endif // PXR_PYTHON_SUPPORT_ENABLED -#include #include #include #include #include #include #include -#include #include #include #include -#include #include #include #include @@ -245,12 +241,13 @@ #include #include #include +#include +#include #include -#include #include #include #include #ifdef PXR_PYTHON_SUPPORT_ENABLED -#include +#include "pxr/base/tf/pySafePython.h" #include #endif // PXR_PYTHON_SUPPORT_ENABLED diff --git a/pxr/base/trace/pch.h b/pxr/base/trace/pch.h index eaa03be60d..25f4b5d6cf 100644 --- a/pxr/base/trace/pch.h +++ b/pxr/base/trace/pch.h @@ -45,6 +45,7 @@ #endif #include #include +#include #include #include #include @@ -55,23 +56,28 @@ #include #include #include +#include #include #include #include +#include #include #include +#include #include #include #include #include +#include +#include #include #include #include +#include #include #include #include #include -#include #include #include #include @@ -83,23 +89,17 @@ #include #include #include -#include -#include -#include +#include #include #include -#include -#include -#include +#include #include #include -#include -#include #include #include +#include #include #include -#include #include #include #include @@ -108,11 +108,18 @@ #include #include #include +#include +#include #include #include #include #include #include +#include +#include +#include +#include +#include #include #include #include @@ -143,7 +150,6 @@ #include #include #include -#include #include #include #include @@ -161,17 +167,12 @@ #undef toupper #endif #endif // PXR_PYTHON_SUPPORT_ENABLED -#include -#include -#include #include #include #include -#include #include #include #include -#include #include #include #include @@ -180,9 +181,10 @@ #include #include #include +#include #include #include #include #ifdef PXR_PYTHON_SUPPORT_ENABLED -#include +#include "pxr/base/tf/pySafePython.h" #endif // PXR_PYTHON_SUPPORT_ENABLED diff --git a/pxr/base/vt/pch.h b/pxr/base/vt/pch.h index 0d802f538d..75f03bee27 100644 --- a/pxr/base/vt/pch.h +++ b/pxr/base/vt/pch.h @@ -45,6 +45,7 @@ #endif #include #include +#include #include #include #include @@ -56,16 +57,17 @@ #include #include #include -#include #include #include #include #include #include +#include #include #include #include #include +#include #include #include #include @@ -84,7 +86,6 @@ #include #include #include -#include #include #include #include @@ -93,15 +94,8 @@ #include #include #include -#include -#include -#include -#include #include #include -#include -#include -#include #include #include #include @@ -113,13 +107,19 @@ #include #include #include +#include +#include #include +#include #include #include #include +#include #include +#include #include #include +#include #include #include #ifdef PXR_PYTHON_SUPPORT_ENABLED @@ -137,6 +137,7 @@ #include #include #include +#include #include #include #include @@ -157,30 +158,25 @@ #undef toupper #endif #endif // PXR_PYTHON_SUPPORT_ENABLED -#include -#include -#include #include #include -#include #include #include #include #include #include -#include #include #include #include #include #include #include -#include #include +#include #include #include #include #include #ifdef PXR_PYTHON_SUPPORT_ENABLED -#include +#include "pxr/base/tf/pySafePython.h" #endif // PXR_PYTHON_SUPPORT_ENABLED diff --git a/pxr/base/work/pch.h b/pxr/base/work/pch.h index 2ff6490732..228b18d0d8 100644 --- a/pxr/base/work/pch.h +++ b/pxr/base/work/pch.h @@ -45,6 +45,7 @@ #endif #include #include +#include #include #include #include @@ -53,9 +54,9 @@ #include #include #include -#include #include #include +#include #include #include #include @@ -64,7 +65,6 @@ #include #include #include -#include #include #include #include @@ -75,9 +75,7 @@ #include #include #include -#include #include -#include #include #include #include @@ -106,21 +104,21 @@ #undef toupper #endif #endif // PXR_PYTHON_SUPPORT_ENABLED -#include -#include #include -#include #include #include #include #include #include #include +#include #include #include #include +#include +#include +#include #include #include #include #include -#include diff --git a/pxr/imaging/cameraUtil/pch.h b/pxr/imaging/cameraUtil/pch.h index 292133b4eb..2cbc054b29 100644 --- a/pxr/imaging/cameraUtil/pch.h +++ b/pxr/imaging/cameraUtil/pch.h @@ -38,6 +38,7 @@ #endif #include #include +#include #include #include #include @@ -46,11 +47,13 @@ #include #include #include -#include +#include +#include #include -#include +#include #include #include +#include #include #include #include @@ -70,20 +73,12 @@ #include #include #include -#include #include #include -#include -#include -#include #include #include -#include -#include -#include #include #include -#include #include #include #include @@ -124,14 +119,12 @@ #undef toupper #endif #endif // PXR_PYTHON_SUPPORT_ENABLED -#include #include -#include #include #include #include #include #include #ifdef PXR_PYTHON_SUPPORT_ENABLED -#include +#include "pxr/base/tf/pySafePython.h" #endif // PXR_PYTHON_SUPPORT_ENABLED diff --git a/pxr/imaging/garch/pch.h b/pxr/imaging/garch/pch.h index 5f805e8e3d..17cdaa5aed 100644 --- a/pxr/imaging/garch/pch.h +++ b/pxr/imaging/garch/pch.h @@ -47,6 +47,7 @@ #include #endif #include +#include #include #include #include @@ -55,9 +56,11 @@ #include #include #include -#include +#include +#include #include #include +#include #include #include #include @@ -77,21 +80,12 @@ #include #include #include -#include #include #include -#include -#include -#include #include #include -#include -#include -#include #include #include -#include -#include #include #include #include @@ -99,10 +93,17 @@ #include #include #include +#include #include #include #include +#include +#include +#include +#include +#include #include +#include #include #include #include @@ -138,14 +139,11 @@ #endif #endif // PXR_PYTHON_SUPPORT_ENABLED #include -#include #include #include -#include #include #include #include -#include #include #include #include @@ -154,5 +152,5 @@ #include #include #ifdef PXR_PYTHON_SUPPORT_ENABLED -#include +#include "pxr/base/tf/pySafePython.h" #endif // PXR_PYTHON_SUPPORT_ENABLED diff --git a/pxr/imaging/glf/pch.h b/pxr/imaging/glf/pch.h index a0bd535e3c..44ae84d4c3 100644 --- a/pxr/imaging/glf/pch.h +++ b/pxr/imaging/glf/pch.h @@ -58,6 +58,8 @@ #include #include #include +#include +#include #include #include #include @@ -68,19 +70,19 @@ #include #include #include -#include #include #include -#include #include #include -#include #include +#include #include +#include #include #include #include #include +#include #include #include #include @@ -91,6 +93,8 @@ #include #include #include +#include +#include #include #include #include @@ -98,36 +102,23 @@ #include #include #include - -#ifdef PXR_OIIO_PLUGIN_ENABLED +#include #include #include #include #include -#endif - #include #include #include -#include #include #include #include #include #include -#include -#include -#include -#include #include #include -#include -#include -#include #include #include -#include -#include #include #include #include @@ -136,11 +127,17 @@ #include #include #include +#include #include #include #include #include #include +#include +#include +#include +#include +#include #include #include #include @@ -192,28 +189,31 @@ #include #include #include -#include #include #include #include #include #include #include -#include #include #include #include -#include #include #include #include #include #include -#include #include #include +#include +#include +#include #include +#include +#include +#include #include +#include #ifdef PXR_PYTHON_SUPPORT_ENABLED -#include +#include "pxr/base/tf/pySafePython.h" #endif // PXR_PYTHON_SUPPORT_ENABLED diff --git a/pxr/imaging/hd/pch.h b/pxr/imaging/hd/pch.h index c0025af15f..604861b7b1 100644 --- a/pxr/imaging/hd/pch.h +++ b/pxr/imaging/hd/pch.h @@ -38,7 +38,6 @@ #define WIN32_LEAN_AND_MEAN #endif -#include #include #include #include @@ -47,6 +46,7 @@ #include #include #include +#include #include #include #include @@ -55,20 +55,21 @@ #include #include #include +#include #include -#include #include #include -#include #include #include #include #include #include +#include #include #include #include #include +#include #include #include #include @@ -77,6 +78,8 @@ #include #include #include +#include +#include #include #include #include @@ -87,9 +90,7 @@ #include #include #include -#include #include -#include #include #include #include @@ -98,24 +99,10 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include #include -#include #include -#include -#include -#include -#include #include #include -#include -#include #include #include #include @@ -152,32 +139,32 @@ #include #include #include -#include -#include #include -#include #include #include #include #include #include -#include #include #include #include #include #include #include -#include #include #include +#include +#include +#include #include #include #include +#include +#include +#include #include #include #include -#include #ifdef PXR_PYTHON_SUPPORT_ENABLED -#include +#include "pxr/base/tf/pySafePython.h" #endif // PXR_PYTHON_SUPPORT_ENABLED diff --git a/pxr/imaging/hdSt/pch.h b/pxr/imaging/hdSt/pch.h index e60a40e336..196960f7b7 100644 --- a/pxr/imaging/hdSt/pch.h +++ b/pxr/imaging/hdSt/pch.h @@ -46,7 +46,10 @@ #endif #include #include +#include #include +#include +#include #include #include #include @@ -55,19 +58,22 @@ #include #include #include +#include #include +#include #include #include -#include #include #include #include #include #include +#include #include #include #include #include +#include #include #include #include @@ -75,6 +81,8 @@ #include #include #include +#include +#include #include #include #include @@ -85,9 +93,7 @@ #include #include #include -#include #include -#include #include #include #include @@ -96,20 +102,12 @@ #include #include #include -#include -#include -#include -#include #include #include -#include -#include -#include #include #include -#include +#include #include -#include #include #include #include @@ -118,16 +116,20 @@ #include #include #include +#include +#include #include #include #include #include #include #include +#include #include #include #include #include +#include #include #include #include @@ -146,22 +148,18 @@ #include #include #include -#include #include -#include #include #include #include #include #include -#include #include #include #include #include #include #include -#include #include #include #include @@ -173,9 +171,16 @@ #include #include #include +#include +#include +#include #include #include #include +#include +#include +#include +#include #ifdef PXR_PYTHON_SUPPORT_ENABLED -#include +#include "pxr/base/tf/pySafePython.h" #endif // PXR_PYTHON_SUPPORT_ENABLED diff --git a/pxr/imaging/hdx/pch.h b/pxr/imaging/hdx/pch.h index 9442a7c9f7..fa468b538e 100644 --- a/pxr/imaging/hdx/pch.h +++ b/pxr/imaging/hdx/pch.h @@ -47,6 +47,7 @@ #include #include #include +#include #include #include #include @@ -55,20 +56,22 @@ #include #include #include +#include #include #include #include -#include #include #include #include #include #include #include +#include #include #include #include #include +#include #include #include #include @@ -76,6 +79,7 @@ #include #include #include +#include #include #include #include @@ -83,12 +87,12 @@ #include #include #include +#include #include #include #include #include -#include -#include +#include #include #include #include @@ -96,19 +100,10 @@ #include #include #include -#include -#include -#include -#include #include #include -#include -#include -#include #include #include -#include -#include #include #include #include @@ -145,28 +140,30 @@ #include #include #include -#include #include -#include #include #include #include #include #include -#include #include #include #include #include #include #include -#include #include #include +#include +#include +#include #include #include #include -#include +#include +#include +#include +#include #ifdef PXR_PYTHON_SUPPORT_ENABLED -#include +#include "pxr/base/tf/pySafePython.h" #endif // PXR_PYTHON_SUPPORT_ENABLED diff --git a/pxr/imaging/hf/pch.h b/pxr/imaging/hf/pch.h index afb08b0b7f..5aec07423f 100644 --- a/pxr/imaging/hf/pch.h +++ b/pxr/imaging/hf/pch.h @@ -26,33 +26,22 @@ #define TF_MAX_ARITY 7 #include "pxr/pxr.h" -#include "pxr/base/arch/defines.h" -#if defined(ARCH_OS_WINDOWS) -#ifndef WIN32_LEAN_AND_MEAN -#define WIN32_LEAN_AND_MEAN -#endif - -#include -#include -#include -#endif #include #include +#include #include -#include #include #include #include -#include -#include +#include +#include #include -#include +#include #include #include #include #include #include -#include #include #include #include @@ -65,39 +54,15 @@ #include #include #include -#include #include -#include -#include -#include #include #include -#include -#include -#include #include #include -#include -#include -#include -#include #include -#include -#include -#include -#include -#include -#include -#include #include -#include -#include -#include -#include #include -#include #include #include -#include #include #include diff --git a/pxr/imaging/hgiGL/pch.h b/pxr/imaging/hgiGL/pch.h index 422ee581b1..46881e229b 100644 --- a/pxr/imaging/hgiGL/pch.h +++ b/pxr/imaging/hgiGL/pch.h @@ -118,5 +118,5 @@ #include #include #ifdef PXR_PYTHON_SUPPORT_ENABLED -#include +#include "pxr/base/tf/pySafePython.h" #endif // PXR_PYTHON_SUPPORT_ENABLED diff --git a/pxr/imaging/hio/pch.h b/pxr/imaging/hio/pch.h index e7906507da..f42afdc5fb 100644 --- a/pxr/imaging/hio/pch.h +++ b/pxr/imaging/hio/pch.h @@ -56,6 +56,7 @@ #endif #include #include +#include #include #include #include @@ -67,7 +68,6 @@ #include #include #include -#include #include #include #include @@ -97,7 +97,6 @@ #include #include #include -#include #include #include #include @@ -107,7 +106,6 @@ #include #include #include -#include #include #include #include @@ -142,7 +140,6 @@ #endif // PXR_PYTHON_SUPPORT_ENABLED #include #include -#include #include #include #include @@ -154,8 +151,6 @@ #include #include #include -#include -#include #ifdef PXR_PYTHON_SUPPORT_ENABLED -#include +#include "pxr/base/tf/pySafePython.h" #endif // PXR_PYTHON_SUPPORT_ENABLED diff --git a/pxr/imaging/plugin/hdEmbree/pch.h b/pxr/imaging/plugin/hdEmbree/pch.h index 4e098053db..c9f102aa01 100644 --- a/pxr/imaging/plugin/hdEmbree/pch.h +++ b/pxr/imaging/plugin/hdEmbree/pch.h @@ -48,6 +48,8 @@ #include #include #include +#include +#include #include #include #include @@ -56,17 +58,20 @@ #include #include #include +#include #include #include -#include #include #include #include +#include #include +#include #include #include #include #include +#include #include #include #include @@ -75,6 +80,7 @@ #include #include #include +#include #include #include #include @@ -85,8 +91,7 @@ #include #include #include -#include -#include +#include #include #include #include @@ -94,19 +99,10 @@ #include #include #include -#include -#include -#include -#include #include #include -#include -#include -#include #include #include -#include -#include #include #include #include @@ -140,34 +136,33 @@ #endif #endif // PXR_PYTHON_SUPPORT_ENABLED #include -#include #include #include -#include #include -#include #include #include #include #include #include -#include #include #include #include #include #include #include -#include #include #include #include #include #include -#include -#include +#include +#include +#include #include -#include +#include +#include +#include +#include #ifdef PXR_PYTHON_SUPPORT_ENABLED -#include +#include "pxr/base/tf/pySafePython.h" #endif // PXR_PYTHON_SUPPORT_ENABLED diff --git a/pxr/imaging/plugin/hdStorm/pch.h b/pxr/imaging/plugin/hdStorm/pch.h index 707fef1a11..33c5124a97 100644 --- a/pxr/imaging/plugin/hdStorm/pch.h +++ b/pxr/imaging/plugin/hdStorm/pch.h @@ -27,32 +27,46 @@ #define TF_MAX_ARITY 7 #include "pxr/pxr.h" #include "pxr/base/arch/defines.h" +#if defined(ARCH_OS_DARWIN) +#include +#endif +#if defined(ARCH_OS_LINUX) +#include +#endif #if defined(ARCH_OS_WINDOWS) #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN #endif +#include #include #include #include #endif #include #include +#include +#include #include #include #include #include +#include #include #include +#include #include -#include +#include #include #include +#include #include +#include #include #include #include #include +#include #include #include #include @@ -60,6 +74,7 @@ #include #include #include +#include #include #include #include @@ -67,20 +82,19 @@ #include #include #include +#include #include #include -#include +#include +#include #include #include -#include -#include +#include +#include #include -#include -#include -#include +#include #include #include -#include #include #include #include @@ -105,8 +119,20 @@ #include #include #include -#include +#ifdef PXR_PYTHON_SUPPORT_ENABLED +#include +#include +#if defined(__APPLE__) // Fix breakage caused by Python's pyport.h. +#undef tolower +#undef toupper +#endif +#endif // PXR_PYTHON_SUPPORT_ENABLED #include +#include +#include +#include +#include +#include #include #include #include @@ -116,3 +142,9 @@ #include #include #include +#include +#include +#include +#ifdef PXR_PYTHON_SUPPORT_ENABLED +#include "pxr/base/tf/pySafePython.h" +#endif // PXR_PYTHON_SUPPORT_ENABLED diff --git a/pxr/imaging/pxOsd/pch.h b/pxr/imaging/pxOsd/pch.h index b660f0ce22..c7bbe82037 100644 --- a/pxr/imaging/pxOsd/pch.h +++ b/pxr/imaging/pxOsd/pch.h @@ -45,6 +45,7 @@ #endif #include #include +#include #include #include #include @@ -52,14 +53,19 @@ #include #include #include -#include +#include +#include +#include #include -#include +#include +#include #include +#include #include #include #include #include +#include #include #include #include @@ -70,30 +76,22 @@ #include #include #include +#include #include #include #include #include #include -#include -#include #include #include #include #include #include #include -#include -#include -#include #include -#include -#include -#include +#include #include #include -#include -#include #include #include #include @@ -119,18 +117,24 @@ #include #include #ifdef PXR_PYTHON_SUPPORT_ENABLED +#include +#include +#include +#include +#include +#include +#include #include #include +#include +#include #if defined(__APPLE__) // Fix breakage caused by Python's pyport.h. #undef tolower #undef toupper #endif #endif // PXR_PYTHON_SUPPORT_ENABLED -#include #include -#include #include -#include #include #include #include @@ -141,11 +145,11 @@ #include #include #include -#include #include #include #include -#include +#include +#include #ifdef PXR_PYTHON_SUPPORT_ENABLED -#include +#include "pxr/base/tf/pySafePython.h" #endif // PXR_PYTHON_SUPPORT_ENABLED diff --git a/pxr/usd/ar/pch.h b/pxr/usd/ar/pch.h index 307e893503..b3333376f4 100644 --- a/pxr/usd/ar/pch.h +++ b/pxr/usd/ar/pch.h @@ -33,6 +33,7 @@ #include #include #include +#include #endif #if defined(ARCH_OS_LINUX) #include @@ -40,12 +41,14 @@ #include #include #include +#include #endif #if defined(ARCH_OS_WINDOWS) #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN #endif +#include #include #include #include @@ -53,6 +56,7 @@ #endif #include #include +#include #include #include #include @@ -62,14 +66,18 @@ #include #include #include -#include +#include +#include #include -#include +#include +#include #include +#include #include #include #include #include +#include #include #include #include @@ -87,40 +95,38 @@ #include #include #include -#include #include #include #include #include -#include -#include -#include -#include #include #include -#include -#include -#include #include +#include #include #include -#include #include #include #include #include -#include #include #include -#include +#include #include -#include +#include +#include #include #include #include #include +#include +#include +#include +#include +#include #include #include +#include #include #include #ifdef PXR_PYTHON_SUPPORT_ENABLED @@ -128,19 +134,25 @@ #include #include #include +#include +#include #include #include #include #include +#include #include +#include #include #include +#include +#include #if defined(__APPLE__) // Fix breakage caused by Python's pyport.h. #undef tolower #undef toupper #endif #endif // PXR_PYTHON_SUPPORT_ENABLED -#include +#include #include #include #include @@ -148,16 +160,16 @@ #include #include #include -#include #include #include #include #include +#include #include -#include #include #include #include +#include #ifdef PXR_PYTHON_SUPPORT_ENABLED -#include +#include "pxr/base/tf/pySafePython.h" #endif // PXR_PYTHON_SUPPORT_ENABLED diff --git a/pxr/usd/kind/pch.h b/pxr/usd/kind/pch.h index 31b14d3755..bcf46042e7 100644 --- a/pxr/usd/kind/pch.h +++ b/pxr/usd/kind/pch.h @@ -38,6 +38,7 @@ #endif #include #include +#include #include #include #include @@ -46,8 +47,9 @@ #include #include #include -#include +#include #include +#include #include #include #include @@ -69,20 +71,13 @@ #include #include #include -#include #include #include -#include -#include -#include #include #include -#include -#include #include #include #include -#include #include #include #include @@ -137,19 +132,16 @@ #undef toupper #endif #endif // PXR_PYTHON_SUPPORT_ENABLED -#include #include #include #include -#include #include #include #include -#include #include #include #include #include #ifdef PXR_PYTHON_SUPPORT_ENABLED -#include +#include "pxr/base/tf/pySafePython.h" #endif // PXR_PYTHON_SUPPORT_ENABLED diff --git a/pxr/usd/ndr/pch.h b/pxr/usd/ndr/pch.h index f1044efcad..897ad796bf 100644 --- a/pxr/usd/ndr/pch.h +++ b/pxr/usd/ndr/pch.h @@ -56,6 +56,7 @@ #endif #include #include +#include #include #include #include @@ -67,15 +68,16 @@ #include #include #include -#include #include -#include +#include #include #include +#include #include #include #include #include +#include #include #include #include @@ -101,21 +103,12 @@ #include #include #include -#include -#include -#include -#include #include -#include #include -#include -#include -#include #include #include #include -#include -#include +#include #include #include #include @@ -124,7 +117,7 @@ #include #include #include -#include +#include #include #include #include @@ -132,6 +125,11 @@ #include #include #include +#include +#include +#include +#include +#include #include #include #include @@ -147,6 +145,7 @@ #include #ifdef PXR_PYTHON_SUPPORT_ENABLED #include +#include #include #include #include @@ -158,17 +157,22 @@ #include #include #include +#include #include #include #include #include #include #include +#include #include #include #include #include +#include +#include #include +#include #include #include #include @@ -178,29 +182,31 @@ #undef toupper #endif #endif // PXR_PYTHON_SUPPORT_ENABLED -#include #include #include #include -#include #include #include #include #include #include #include -#include #include #include #include #include -#include #include #include #include -#include #include -#include +#include +#include +#include +#include +#include +#include +#include +#include #ifdef PXR_PYTHON_SUPPORT_ENABLED -#include +#include "pxr/base/tf/pySafePython.h" #endif // PXR_PYTHON_SUPPORT_ENABLED diff --git a/pxr/usd/pcp/pch.h b/pxr/usd/pcp/pch.h index 400ea1e9d2..a7180637dd 100644 --- a/pxr/usd/pcp/pch.h +++ b/pxr/usd/pcp/pch.h @@ -45,6 +45,7 @@ #endif #include #include +#include #include #include #include @@ -56,16 +57,17 @@ #include #include #include -#include #include #include #include #include #include +#include #include #include #include #include +#include #include #include #include @@ -74,6 +76,7 @@ #include #include #include +#include #include #include #include @@ -86,8 +89,6 @@ #include #include #include -#include -#include #include #include #include @@ -99,22 +100,12 @@ #include #include #include -#include -#include -#include -#include #include -#include -#include #include -#include -#include -#include -#include #include #include #include -#include +#include #include #include #include @@ -123,7 +114,7 @@ #include #include #include -#include +#include #include #include #include @@ -131,6 +122,11 @@ #include #include #include +#include +#include +#include +#include +#include #include #include #include @@ -146,7 +142,6 @@ #include #ifdef PXR_PYTHON_SUPPORT_ENABLED #include -#include #include #include #include @@ -161,34 +156,26 @@ #include #include #include -#include #include #include #include #include -#include #include #include #include #include -#include -#include #include #include #include #include #include #include -#include #if defined(__APPLE__) // Fix breakage caused by Python's pyport.h. #undef tolower #undef toupper #endif #endif // PXR_PYTHON_SUPPORT_ENABLED -#include #include -#include -#include #include #include #include @@ -198,30 +185,29 @@ #include #include #include -#include #include #include #include -#include #include -#include #include #include #include #include #include -#include #include +#include +#include #include #include #include #include +#include +#include #include #include #include #include #include -#include #ifdef PXR_PYTHON_SUPPORT_ENABLED -#include +#include "pxr/base/tf/pySafePython.h" #endif // PXR_PYTHON_SUPPORT_ENABLED diff --git a/pxr/usd/plugin/sdrOsl/pch.h b/pxr/usd/plugin/sdrOsl/pch.h index 4d9f5b9907..f1a725cd6d 100644 --- a/pxr/usd/plugin/sdrOsl/pch.h +++ b/pxr/usd/plugin/sdrOsl/pch.h @@ -45,6 +45,7 @@ #endif #include #include +#include #include #include #include @@ -53,11 +54,12 @@ #include #include #include -#include +#include +#include #include -#include #include #include +#include #include #include #include @@ -77,28 +79,19 @@ #include #include #include +#include #include #include -#include #include #include #include #include #include #include -#include -#include -#include -#include #include #include -#include -#include -#include #include #include -#include -#include #include #include #include @@ -134,22 +127,17 @@ #undef toupper #endif #endif // PXR_PYTHON_SUPPORT_ENABLED -#include #include -#include #include #include #include #include #include -#include #include #include #include #include #include -#include -#include #ifdef PXR_PYTHON_SUPPORT_ENABLED -#include +#include "pxr/base/tf/pySafePython.h" #endif // PXR_PYTHON_SUPPORT_ENABLED diff --git a/pxr/usd/plugin/usdAbc/pch.h b/pxr/usd/plugin/usdAbc/pch.h index bf59f352c5..f5c7e6fb6c 100644 --- a/pxr/usd/plugin/usdAbc/pch.h +++ b/pxr/usd/plugin/usdAbc/pch.h @@ -58,6 +58,7 @@ #include #include #include +#include #include #include #include @@ -70,16 +71,16 @@ #include #include #include -#include #include -#include #include #include #include +#include #include #include #include #include +#include #include #include #include @@ -89,6 +90,7 @@ #include #include #include +#include #include #include #include @@ -127,8 +129,6 @@ #include #include #include -#include -#include #include #include #include @@ -138,23 +138,12 @@ #include #include #include -#include -#include -#include -#include #include -#include -#include -#include #include -#include -#include -#include -#include #include #include #include -#include +#include #include #include #include @@ -163,7 +152,6 @@ #include #include #include -#include #include #include #include @@ -200,10 +188,7 @@ #endif #endif // PXR_PYTHON_SUPPORT_ENABLED #include -#include #include -#include -#include #include #include #include @@ -211,22 +196,19 @@ #include #include #include -#include #include #include #include -#include #include -#include #include #include #include #include #include -#include #include #include -#include +#include +#include #include #include #include @@ -235,5 +217,5 @@ #include #include #ifdef PXR_PYTHON_SUPPORT_ENABLED -#include +#include "pxr/base/tf/pySafePython.h" #endif // PXR_PYTHON_SUPPORT_ENABLED diff --git a/pxr/usd/plugin/usdDraco/pch.h b/pxr/usd/plugin/usdDraco/pch.h index f3551b8abf..aff99924d4 100644 --- a/pxr/usd/plugin/usdDraco/pch.h +++ b/pxr/usd/plugin/usdDraco/pch.h @@ -47,6 +47,7 @@ #include #include #include +#include #include #include #include @@ -54,20 +55,21 @@ #include #include #include +#include #include #include #include #include -#include #include -#include #include #include #include +#include #include #include #include #include +#include #include #include #include @@ -75,6 +77,7 @@ #include #include #include +#include #include #include #include @@ -86,36 +89,21 @@ #include #include #include -#include -#include #include #include #include -#include #include #include #include #include #include -#include #include -#include -#include -#include -#include #include -#include -#include -#include #include -#include -#include -#include -#include #include #include #include -#include +#include #include #include #include @@ -124,7 +112,6 @@ #include #include #include -#include #include #include #include @@ -146,9 +133,11 @@ #include #include #ifdef PXR_PYTHON_SUPPORT_ENABLED +#include #include #include #include +#include #include #include #include @@ -157,35 +146,32 @@ #undef tolower #undef toupper #endif -#endif // PXR_PYTHON_SUPPORT_ENABLED +#endif // PXR_PYTHON_SUPPORT_ENABLED #include -#include #include -#include -#include #include -#include #include #include #include #include #include -#include #include #include #include -#include #include -#include #include #include #include #include #include -#include #include +#include +#include +#include +#include #include -#include +#include +#include #include #include #include @@ -194,5 +180,5 @@ #include #include #ifdef PXR_PYTHON_SUPPORT_ENABLED -#include -#endif // PXR_PYTHON_SUPPORT_ENABLED +#include "pxr/base/tf/pySafePython.h" +#endif // PXR_PYTHON_SUPPORT_ENABLED diff --git a/pxr/usd/plugin/usdMtlx/pch.h b/pxr/usd/plugin/usdMtlx/pch.h index 6e83b85f56..5eba44e7ed 100644 --- a/pxr/usd/plugin/usdMtlx/pch.h +++ b/pxr/usd/plugin/usdMtlx/pch.h @@ -59,6 +59,7 @@ #include #include #include +#include #include #include #include @@ -71,9 +72,7 @@ #include #include #include -#include #include -#include #include #include #include @@ -82,6 +81,7 @@ #include #include #include +#include #include #include #include @@ -90,6 +90,7 @@ #include #include #include +#include #include #include #include @@ -103,7 +104,6 @@ #include #include #include -#include #include #include #include @@ -113,19 +113,12 @@ #include #include #include -#include -#include #include -#include -#include -#include #include -#include -#include #include #include #include -#include +#include #include #include #include @@ -134,7 +127,7 @@ #include #include #include -#include +#include #include #include #include @@ -142,6 +135,11 @@ #include #include #include +#include +#include +#include +#include +#include #include #include #include @@ -179,31 +177,25 @@ #endif #endif // PXR_PYTHON_SUPPORT_ENABLED #include -#include #include -#include #include -#include #include #include #include #include #include -#include #include #include #include #include -#include #include #include #include #include #include -#include #include #include -#include +#include #include #include #include @@ -213,5 +205,5 @@ #include #include #ifdef PXR_PYTHON_SUPPORT_ENABLED -#include +#include "pxr/base/tf/pySafePython.h" #endif // PXR_PYTHON_SUPPORT_ENABLED diff --git a/pxr/usd/sdf/pch.h b/pxr/usd/sdf/pch.h index aec407c4d5..234a3bb17c 100644 --- a/pxr/usd/sdf/pch.h +++ b/pxr/usd/sdf/pch.h @@ -57,6 +57,7 @@ #include #include #include +#include #include #include #include @@ -70,7 +71,6 @@ #include #include #include -#include #include #include #include @@ -81,6 +81,8 @@ #include #include #include +#include +#include #include #include #include @@ -91,6 +93,7 @@ #include #include #include +#include #include #include #include @@ -103,7 +106,6 @@ #include #include #include -#include #include #include #include @@ -115,26 +117,14 @@ #include #include #include -#include #include -#include -#include -#include #include -#include #include -#include -#include -#include #include -#include -#include -#include -#include #include #include #include -#include +#include #include #include #include @@ -142,9 +132,11 @@ #include #include #include +#include +#include #include #include -#include +#include #include #include #include @@ -152,6 +144,12 @@ #include #include #include +#include +#include +#include +#include +#include +#include #include #include #include @@ -215,10 +213,7 @@ #undef toupper #endif #endif // PXR_PYTHON_SUPPORT_ENABLED -#include #include -#include -#include #include #include #include @@ -228,27 +223,27 @@ #include #include #include -#include #include #include #include -#include #include -#include #include #include #include #include -#include #include #include +#include +#include #include +#include #include +#include +#include #include #include #include #include -#include #ifdef PXR_PYTHON_SUPPORT_ENABLED -#include +#include "pxr/base/tf/pySafePython.h" #endif // PXR_PYTHON_SUPPORT_ENABLED diff --git a/pxr/usd/sdr/pch.h b/pxr/usd/sdr/pch.h index 85d9d937fd..b4edc214fc 100644 --- a/pxr/usd/sdr/pch.h +++ b/pxr/usd/sdr/pch.h @@ -45,6 +45,7 @@ #endif #include #include +#include #include #include #include @@ -55,9 +56,9 @@ #include #include #include -#include #include #include +#include #include #include #include @@ -65,6 +66,7 @@ #include #include #include +#include #include #include #include @@ -81,7 +83,6 @@ #include #include #include -#include #include #include #include @@ -89,21 +90,12 @@ #include #include #include -#include -#include -#include -#include #include -#include #include -#include -#include -#include #include #include #include -#include -#include +#include #include #include #include @@ -112,7 +104,6 @@ #include #include #include -#include #include #include #include @@ -165,28 +156,24 @@ #undef toupper #endif #endif // PXR_PYTHON_SUPPORT_ENABLED -#include #include #include #include -#include #include #include #include #include #include #include -#include #include #include #include #include -#include #include #include #include -#include -#include +#include +#include #ifdef PXR_PYTHON_SUPPORT_ENABLED -#include +#include "pxr/base/tf/pySafePython.h" #endif // PXR_PYTHON_SUPPORT_ENABLED diff --git a/pxr/usd/usd/pch.h b/pxr/usd/usd/pch.h index 165abc1c8a..bd515aa438 100644 --- a/pxr/usd/usd/pch.h +++ b/pxr/usd/usd/pch.h @@ -57,6 +57,7 @@ #include #include #include +#include #include #include #include @@ -64,12 +65,12 @@ #include #include #include +#include #include #include #include #include #include -#include #include #include #include @@ -80,6 +81,7 @@ #include #include #include +#include #include #include #include @@ -103,7 +105,7 @@ #include #include #include -#include +#include #include #include #include @@ -116,19 +118,8 @@ #include #include #include -#include -#include -#include -#include #include -#include -#include -#include #include -#include -#include -#include -#include #include #include #include @@ -137,7 +128,7 @@ #include #include #include -#include +#include #include #include #include @@ -146,7 +137,8 @@ #include #include #include -#include +#include +#include #include #include #include @@ -154,6 +146,11 @@ #include #include #include +#include +#include +#include +#include +#include #include #include #include @@ -182,11 +179,13 @@ #include #include #include +#include #include #include #include #include #include +#include #include #include #include @@ -196,6 +195,7 @@ #include #include #include +#include #include #include #include @@ -208,10 +208,7 @@ #include #include #include -#include #include -#include -#include #include #include #include @@ -221,33 +218,31 @@ #include #include #include -#include #include #include #include -#include #include -#include #include #include #include #include #include #include -#include #include +#include +#include #include #include #include #include #include #include +#include #include #include #include #include #include -#include #ifdef PXR_PYTHON_SUPPORT_ENABLED -#include +#include "pxr/base/tf/pySafePython.h" #endif // PXR_PYTHON_SUPPORT_ENABLED diff --git a/pxr/usd/usdGeom/pch.h b/pxr/usd/usdGeom/pch.h index f843ff27e0..824c5b0f93 100644 --- a/pxr/usd/usdGeom/pch.h +++ b/pxr/usd/usdGeom/pch.h @@ -47,6 +47,7 @@ #include #include #include +#include #include #include #include @@ -58,9 +59,7 @@ #include #include #include -#include #include -#include #include #include #include @@ -69,6 +68,8 @@ #include #include #include +#include +#include #include #include #include @@ -76,6 +77,7 @@ #include #include #include +#include #include #include #include @@ -85,11 +87,8 @@ #include #include #include -#include #include #include -#include -#include #include #include #include @@ -99,23 +98,12 @@ #include #include #include -#include -#include -#include -#include #include -#include -#include -#include #include -#include -#include -#include -#include #include #include #include -#include +#include #include #include #include @@ -124,7 +112,6 @@ #include #include #include -#include #include #include #include @@ -165,6 +152,7 @@ #include #include #include +#include #include #include #include @@ -174,43 +162,40 @@ #endif #endif // PXR_PYTHON_SUPPORT_ENABLED #include -#include #include #include -#include -#include #include #include -#include #include #include #include #include #include -#include #include #include #include -#include #include -#include #include #include #include #include #include -#include #include #include -#include +#include +#include +#include #include #include #include +#include +#include +#include #include #include #include #include #include #ifdef PXR_PYTHON_SUPPORT_ENABLED -#include +#include "pxr/base/tf/pySafePython.h" #endif // PXR_PYTHON_SUPPORT_ENABLED diff --git a/pxr/usd/usdHydra/pch.h b/pxr/usd/usdHydra/pch.h index c99c6dac65..5ba9df4c20 100644 --- a/pxr/usd/usdHydra/pch.h +++ b/pxr/usd/usdHydra/pch.h @@ -46,6 +46,7 @@ #include #include #include +#include #include #include #include @@ -57,9 +58,7 @@ #include #include #include -#include #include -#include #include #include #include @@ -68,6 +67,7 @@ #include #include #include +#include #include #include #include @@ -75,6 +75,7 @@ #include #include #include +#include #include #include #include @@ -86,8 +87,6 @@ #include #include #include -#include -#include #include #include #include @@ -97,23 +96,12 @@ #include #include #include -#include -#include -#include -#include #include -#include -#include -#include #include -#include -#include -#include -#include #include #include #include -#include +#include #include #include #include @@ -122,7 +110,6 @@ #include #include #include -#include #include #include #include @@ -144,20 +131,14 @@ #include #include #ifdef PXR_PYTHON_SUPPORT_ENABLED -#include #include -#include #include #include #include -#include #include #include #include #include -#include -#include -#include #include #if defined(__APPLE__) // Fix breakage caused by Python's pyport.h. #undef tolower @@ -165,33 +146,25 @@ #endif #endif // PXR_PYTHON_SUPPORT_ENABLED #include -#include #include -#include -#include -#include #include -#include #include #include #include #include #include -#include #include #include #include -#include #include -#include #include #include #include #include #include -#include #include -#include +#include +#include #include #include #include @@ -200,5 +173,5 @@ #include #include #ifdef PXR_PYTHON_SUPPORT_ENABLED -#include +#include "pxr/base/tf/pySafePython.h" #endif // PXR_PYTHON_SUPPORT_ENABLED diff --git a/pxr/usd/usdLux/pch.h b/pxr/usd/usdLux/pch.h index f90904a6cd..8fe34cb954 100644 --- a/pxr/usd/usdLux/pch.h +++ b/pxr/usd/usdLux/pch.h @@ -47,6 +47,7 @@ #include #include #include +#include #include #include #include @@ -58,9 +59,7 @@ #include #include #include -#include #include -#include #include #include #include @@ -69,6 +68,7 @@ #include #include #include +#include #include #include #include @@ -76,6 +76,7 @@ #include #include #include +#include #include #include #include @@ -87,8 +88,6 @@ #include #include #include -#include -#include #include #include #include @@ -98,23 +97,12 @@ #include #include #include -#include -#include -#include -#include #include -#include -#include -#include #include -#include -#include -#include -#include #include #include #include -#include +#include #include #include #include @@ -123,7 +111,6 @@ #include #include #include -#include #include #include #include @@ -172,34 +159,27 @@ #endif #endif // PXR_PYTHON_SUPPORT_ENABLED #include -#include #include -#include -#include #include #include -#include #include #include #include #include #include -#include #include #include #include -#include #include -#include #include #include #include #include #include -#include #include #include -#include +#include +#include #include #include #include @@ -208,5 +188,5 @@ #include #include #ifdef PXR_PYTHON_SUPPORT_ENABLED -#include +#include "pxr/base/tf/pySafePython.h" #endif // PXR_PYTHON_SUPPORT_ENABLED diff --git a/pxr/usd/usdMedia/pch.h b/pxr/usd/usdMedia/pch.h index 33b674febc..7802ec3e2d 100644 --- a/pxr/usd/usdMedia/pch.h +++ b/pxr/usd/usdMedia/pch.h @@ -181,5 +181,5 @@ #include #include #ifdef PXR_PYTHON_SUPPORT_ENABLED -#include +#include "pxr/base/tf/pySafePython.h" #endif // PXR_PYTHON_SUPPORT_ENABLED diff --git a/pxr/usd/usdRender/pch.h b/pxr/usd/usdRender/pch.h index 33b674febc..7802ec3e2d 100644 --- a/pxr/usd/usdRender/pch.h +++ b/pxr/usd/usdRender/pch.h @@ -181,5 +181,5 @@ #include #include #ifdef PXR_PYTHON_SUPPORT_ENABLED -#include +#include "pxr/base/tf/pySafePython.h" #endif // PXR_PYTHON_SUPPORT_ENABLED diff --git a/pxr/usd/usdRi/pch.h b/pxr/usd/usdRi/pch.h index fe3211dacd..905d2a1236 100644 --- a/pxr/usd/usdRi/pch.h +++ b/pxr/usd/usdRi/pch.h @@ -47,6 +47,7 @@ #include #include #include +#include #include #include #include @@ -58,9 +59,7 @@ #include #include #include -#include #include -#include #include #include #include @@ -69,6 +68,7 @@ #include #include #include +#include #include #include #include @@ -76,6 +76,7 @@ #include #include #include +#include #include #include #include @@ -87,8 +88,6 @@ #include #include #include -#include -#include #include #include #include @@ -98,23 +97,12 @@ #include #include #include -#include -#include -#include -#include #include -#include -#include -#include #include -#include -#include -#include -#include #include #include #include -#include +#include #include #include #include @@ -123,7 +111,6 @@ #include #include #include -#include #include #include #include @@ -159,7 +146,6 @@ #include #include #include -#include #include #include #include @@ -169,34 +155,27 @@ #endif #endif // PXR_PYTHON_SUPPORT_ENABLED #include -#include #include -#include -#include #include #include -#include #include #include #include #include #include -#include #include #include #include -#include #include -#include #include #include #include #include #include -#include #include #include -#include +#include +#include #include #include #include @@ -205,5 +184,5 @@ #include #include #ifdef PXR_PYTHON_SUPPORT_ENABLED -#include +#include "pxr/base/tf/pySafePython.h" #endif // PXR_PYTHON_SUPPORT_ENABLED diff --git a/pxr/usd/usdShade/pch.h b/pxr/usd/usdShade/pch.h index ad0f3135f5..698ab0ca65 100644 --- a/pxr/usd/usdShade/pch.h +++ b/pxr/usd/usdShade/pch.h @@ -46,7 +46,9 @@ #include #include #include +#include #include +#include #include #include #include @@ -58,9 +60,7 @@ #include #include #include -#include #include -#include #include #include #include @@ -69,6 +69,7 @@ #include #include #include +#include #include #include #include @@ -77,6 +78,7 @@ #include #include #include +#include #include #include #include @@ -88,8 +90,6 @@ #include #include #include -#include -#include #include #include #include @@ -98,24 +98,14 @@ #include #include #include +#include #include -#include -#include -#include -#include #include -#include -#include -#include #include -#include -#include -#include -#include #include #include #include -#include +#include #include #include #include @@ -124,7 +114,6 @@ #include #include #include -#include #include #include #include @@ -161,6 +150,7 @@ #include #include #include +#include #include #include #include @@ -171,40 +161,38 @@ #endif #endif // PXR_PYTHON_SUPPORT_ENABLED #include -#include #include -#include -#include #include #include -#include #include #include #include #include #include -#include #include #include #include -#include #include -#include #include #include #include #include #include -#include +#include #include -#include +#include +#include +#include +#include #include #include #include +#include +#include #include #include #include #include #ifdef PXR_PYTHON_SUPPORT_ENABLED -#include +#include "pxr/base/tf/pySafePython.h" #endif // PXR_PYTHON_SUPPORT_ENABLED diff --git a/pxr/usd/usdSkel/pch.h b/pxr/usd/usdSkel/pch.h index 60dc32e42a..a4205ac46d 100644 --- a/pxr/usd/usdSkel/pch.h +++ b/pxr/usd/usdSkel/pch.h @@ -47,6 +47,7 @@ #include #include #include +#include #include #include #include @@ -58,9 +59,7 @@ #include #include #include -#include #include -#include #include #include #include @@ -69,6 +68,8 @@ #include #include #include +#include +#include #include #include #include @@ -76,6 +77,7 @@ #include #include #include +#include #include #include #include @@ -87,8 +89,6 @@ #include #include #include -#include -#include #include #include #include @@ -98,23 +98,12 @@ #include #include #include -#include -#include -#include -#include #include -#include -#include -#include #include -#include -#include -#include -#include #include #include #include -#include +#include #include #include #include @@ -123,7 +112,6 @@ #include #include #include -#include #include #include #include @@ -147,16 +135,22 @@ #ifdef PXR_PYTHON_SUPPORT_ENABLED #include #include +#include +#include +#include +#include +#include +#include #include #include #include #include +#include #include #include #include #include #include -#include #include #include #include @@ -166,41 +160,40 @@ #endif #endif // PXR_PYTHON_SUPPORT_ENABLED #include -#include +#include #include -#include -#include #include #include -#include #include #include #include #include +#include #include -#include #include #include #include -#include #include -#include #include #include #include #include #include -#include #include #include -#include +#include +#include +#include #include #include #include +#include +#include +#include #include #include #include #include #ifdef PXR_PYTHON_SUPPORT_ENABLED -#include +#include "pxr/base/tf/pySafePython.h" #endif // PXR_PYTHON_SUPPORT_ENABLED diff --git a/pxr/usd/usdUI/pch.h b/pxr/usd/usdUI/pch.h index c99c6dac65..47666439a2 100644 --- a/pxr/usd/usdUI/pch.h +++ b/pxr/usd/usdUI/pch.h @@ -46,6 +46,7 @@ #include #include #include +#include #include #include #include @@ -57,9 +58,7 @@ #include #include #include -#include #include -#include #include #include #include @@ -68,6 +67,7 @@ #include #include #include +#include #include #include #include @@ -75,6 +75,7 @@ #include #include #include +#include #include #include #include @@ -86,8 +87,6 @@ #include #include #include -#include -#include #include #include #include @@ -97,23 +96,12 @@ #include #include #include -#include -#include -#include -#include #include -#include -#include -#include #include -#include -#include -#include -#include #include #include #include -#include +#include #include #include #include @@ -122,7 +110,6 @@ #include #include #include -#include #include #include #include @@ -155,7 +142,6 @@ #include #include #include -#include #include #include #include @@ -165,33 +151,26 @@ #endif #endif // PXR_PYTHON_SUPPORT_ENABLED #include -#include #include -#include -#include #include #include -#include #include #include #include #include #include -#include #include #include #include -#include #include -#include #include #include #include #include #include -#include #include -#include +#include +#include #include #include #include @@ -200,5 +179,5 @@ #include #include #ifdef PXR_PYTHON_SUPPORT_ENABLED -#include +#include "pxr/base/tf/pySafePython.h" #endif // PXR_PYTHON_SUPPORT_ENABLED diff --git a/pxr/usd/usdUtils/pch.h b/pxr/usd/usdUtils/pch.h index ccd3f84f18..3a108ee5ef 100644 --- a/pxr/usd/usdUtils/pch.h +++ b/pxr/usd/usdUtils/pch.h @@ -57,6 +57,7 @@ #include #include #include +#include #include #include #include @@ -69,7 +70,6 @@ #include #include #include -#include #include #include #include @@ -80,6 +80,8 @@ #include #include #include +#include +#include #include #include #include @@ -89,6 +91,7 @@ #include #include #include +#include #include #include #include @@ -99,13 +102,12 @@ #include #include #include -#include #include #include -#include #include #include #include +#include #include #include #include @@ -114,23 +116,12 @@ #include #include #include -#include -#include -#include -#include #include -#include -#include -#include #include -#include -#include -#include -#include #include #include #include -#include +#include #include #include #include @@ -139,7 +130,7 @@ #include #include #include -#include +#include #include #include #include @@ -147,6 +138,11 @@ #include #include #include +#include +#include +#include +#include +#include #include #include #include @@ -162,6 +158,7 @@ #include #ifdef PXR_PYTHON_SUPPORT_ENABLED #include +#include #include #include #include @@ -178,6 +175,7 @@ #include #include #include +#include #include #include #include @@ -186,54 +184,51 @@ #include #include #include +#include #include #include #include #include #include +#include #if defined(__APPLE__) // Fix breakage caused by Python's pyport.h. #undef tolower #undef toupper #endif #endif // PXR_PYTHON_SUPPORT_ENABLED #include -#include #include -#include -#include #include #include -#include #include #include #include #include #include #include -#include #include #include #include -#include #include -#include #include #include #include #include #include -#include #include -#include +#include +#include +#include #include #include #include +#include +#include #include #include #include #include #include -#include #ifdef PXR_PYTHON_SUPPORT_ENABLED -#include +#include "pxr/base/tf/pySafePython.h" #endif // PXR_PYTHON_SUPPORT_ENABLED diff --git a/pxr/usd/usdVol/pch.h b/pxr/usd/usdVol/pch.h index f843ff27e0..7802ec3e2d 100644 --- a/pxr/usd/usdVol/pch.h +++ b/pxr/usd/usdVol/pch.h @@ -47,6 +47,7 @@ #include #include #include +#include #include #include #include @@ -58,9 +59,7 @@ #include #include #include -#include #include -#include #include #include #include @@ -69,6 +68,7 @@ #include #include #include +#include #include #include #include @@ -76,6 +76,7 @@ #include #include #include +#include #include #include #include @@ -85,11 +86,8 @@ #include #include #include -#include #include #include -#include -#include #include #include #include @@ -99,23 +97,12 @@ #include #include #include -#include -#include -#include -#include #include -#include -#include -#include #include -#include -#include -#include -#include #include #include #include -#include +#include #include #include #include @@ -124,7 +111,6 @@ #include #include #include -#include #include #include #include @@ -148,23 +134,15 @@ #ifdef PXR_PYTHON_SUPPORT_ENABLED #include #include -#include -#include -#include -#include #include #include #include #include -#include #include #include #include #include #include -#include -#include -#include #include #include #include @@ -174,43 +152,34 @@ #endif #endif // PXR_PYTHON_SUPPORT_ENABLED #include -#include -#include #include -#include -#include #include #include -#include #include #include #include #include #include -#include #include #include #include -#include #include -#include #include #include #include #include #include -#include #include #include -#include +#include +#include #include #include #include -#include #include #include #include #include #ifdef PXR_PYTHON_SUPPORT_ENABLED -#include +#include "pxr/base/tf/pySafePython.h" #endif // PXR_PYTHON_SUPPORT_ENABLED diff --git a/pxr/usdImaging/plugin/sdrGlslfx/pch.h b/pxr/usdImaging/plugin/sdrGlslfx/pch.h index 9f373107d9..43da5ee7ac 100644 --- a/pxr/usdImaging/plugin/sdrGlslfx/pch.h +++ b/pxr/usdImaging/plugin/sdrGlslfx/pch.h @@ -27,40 +27,28 @@ #define TF_MAX_ARITY 7 #include "pxr/pxr.h" #include "pxr/base/arch/defines.h" -#if defined(ARCH_OS_DARWIN) -#include -#endif -#if defined(ARCH_OS_LINUX) -#include -#endif #if defined(ARCH_OS_WINDOWS) #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN #endif -#include #include #include #include #endif #include #include -#include +#include #include #include #include #include -#include #include #include #include -#include #include #include -#include #include -#include -#include #include #include #include @@ -84,31 +72,16 @@ #include #include #include -#include -#include -#include #include #include #include -#include #include -#include #include #include #include -#include -#include #include -#include -#include -#include -#include -#include -#include #include #include -#include -#include #include #include #include @@ -117,21 +90,16 @@ #include #include #include -#include -#include -#include #include #include #include #include #include #include -#include #include #include #include #include -#include #include #include #include @@ -140,23 +108,15 @@ #include #ifdef PXR_PYTHON_SUPPORT_ENABLED #include -#include -#include -#include #include #include -#include #if defined(__APPLE__) // Fix breakage caused by Python's pyport.h. #undef tolower #undef toupper #endif #endif // PXR_PYTHON_SUPPORT_ENABLED -#include #include -#include -#include #include -#include #include #include #include @@ -166,22 +126,7 @@ #include #include #include -#include -#include -#include -#include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #ifdef PXR_PYTHON_SUPPORT_ENABLED -#include +#include "pxr/base/tf/pySafePython.h" #endif // PXR_PYTHON_SUPPORT_ENABLED diff --git a/pxr/usdImaging/plugin/usdShaders/pch.h b/pxr/usdImaging/plugin/usdShaders/pch.h index 9f373107d9..2037e25b8b 100644 --- a/pxr/usdImaging/plugin/usdShaders/pch.h +++ b/pxr/usdImaging/plugin/usdShaders/pch.h @@ -46,6 +46,7 @@ #include #include #include +#include #include #include #include @@ -57,9 +58,7 @@ #include #include #include -#include #include -#include #include #include #include @@ -68,6 +67,7 @@ #include #include #include +#include #include #include #include @@ -75,6 +75,7 @@ #include #include #include +#include #include #include #include @@ -86,7 +87,6 @@ #include #include #include -#include #include #include #include @@ -96,19 +96,12 @@ #include #include #include -#include -#include #include -#include -#include -#include #include -#include -#include #include #include #include -#include +#include #include #include #include @@ -117,7 +110,6 @@ #include #include #include -#include #include #include #include @@ -152,11 +144,8 @@ #endif #endif // PXR_PYTHON_SUPPORT_ENABLED #include -#include #include -#include #include -#include #include #include #include @@ -166,15 +155,14 @@ #include #include #include -#include #include #include #include #include #include -#include #include #include +#include #include #include #include @@ -183,5 +171,5 @@ #include #include #ifdef PXR_PYTHON_SUPPORT_ENABLED -#include +#include "pxr/base/tf/pySafePython.h" #endif // PXR_PYTHON_SUPPORT_ENABLED diff --git a/pxr/usdImaging/usdAppUtils/pch.h b/pxr/usdImaging/usdAppUtils/pch.h index 5798e3bbb3..70b9602d5e 100644 --- a/pxr/usdImaging/usdAppUtils/pch.h +++ b/pxr/usdImaging/usdAppUtils/pch.h @@ -48,6 +48,7 @@ #include #include #include +#include #include #include #include @@ -59,16 +60,16 @@ #include #include #include -#include #include -#include #include #include #include +#include #include #include #include #include +#include #include #include #include @@ -76,6 +77,7 @@ #include #include #include +#include #include #include #include @@ -85,11 +87,9 @@ #include #include #include -#include #include #include -#include -#include +#include #include #include #include @@ -99,23 +99,12 @@ #include #include #include -#include -#include -#include -#include #include -#include -#include -#include #include -#include -#include -#include -#include #include #include #include -#include +#include #include #include #include @@ -124,7 +113,6 @@ #include #include #include -#include #include #include #include @@ -156,7 +144,6 @@ #include #include #include -#include #include #include #if defined(__APPLE__) // Fix breakage caused by Python's pyport.h. @@ -164,40 +151,38 @@ #undef toupper #endif #endif // PXR_PYTHON_SUPPORT_ENABLED +#include #include -#include +#include #include -#include -#include +#include #include -#include #include #include #include #include #include -#include #include #include #include #include -#include #include #include #include -#include #include #include -#include #include +#include #include -#include +#include +#include #include #include #include #include #include #include +#include #ifdef PXR_PYTHON_SUPPORT_ENABLED -#include +#include "pxr/base/tf/pySafePython.h" #endif // PXR_PYTHON_SUPPORT_ENABLED diff --git a/pxr/usdImaging/usdImaging/pch.h b/pxr/usdImaging/usdImaging/pch.h index 410c84ffbb..35ea5620ec 100644 --- a/pxr/usdImaging/usdImaging/pch.h +++ b/pxr/usdImaging/usdImaging/pch.h @@ -38,7 +38,6 @@ #define WIN32_LEAN_AND_MEAN #endif -#include #include #include #include @@ -48,6 +47,7 @@ #include #include #include +#include #include #include #include @@ -55,19 +55,22 @@ #include #include #include +#include #include #include #include -#include #include -#include #include #include #include +#include #include #include #include #include +#include +#include +#include #include #include #include @@ -75,6 +78,8 @@ #include #include #include +#include +#include #include #include #include @@ -87,9 +92,7 @@ #include #include #include -#include #include -#include #include #include #include @@ -99,22 +102,12 @@ #include #include #include -#include -#include -#include -#include #include -#include -#include -#include #include -#include -#include -#include -#include +#include #include #include -#include +#include #include #include #include @@ -123,7 +116,6 @@ #include #include #include -#include #include #include #include @@ -144,13 +136,25 @@ #include #include #include +#ifdef PXR_PYTHON_SUPPORT_ENABLED +#include +#include +#include +#include +#include +#include +#include +#if defined(__APPLE__) // Fix breakage caused by Python's pyport.h. +#undef tolower +#undef toupper +#endif +#endif // PXR_PYTHON_SUPPORT_ENABLED #include #include #include +#include #include #include -#include -#include #include #include #include @@ -158,30 +162,31 @@ #include #include #include -#include #include #include #include -#include #include -#include #include #include #include #include #include -#include #include #include #include -#include +#include +#include #include #include #include #include #include +#include +#include #include #include #include #include -#include +#ifdef PXR_PYTHON_SUPPORT_ENABLED +#include "pxr/base/tf/pySafePython.h" +#endif // PXR_PYTHON_SUPPORT_ENABLED diff --git a/pxr/usdImaging/usdImagingGL/pch.h b/pxr/usdImaging/usdImagingGL/pch.h index 20516f1e59..b9dfa7e416 100644 --- a/pxr/usdImaging/usdImagingGL/pch.h +++ b/pxr/usdImaging/usdImagingGL/pch.h @@ -48,8 +48,8 @@ #include #include #include +#include #include -#include #include #include #include @@ -60,16 +60,16 @@ #include #include #include -#include #include -#include #include #include #include +#include #include #include #include #include +#include #include #include #include @@ -78,6 +78,8 @@ #include #include #include +#include +#include #include #include #include @@ -90,9 +92,7 @@ #include #include #include -#include #include -#include #include #include #include @@ -102,23 +102,12 @@ #include #include #include -#include -#include -#include -#include #include -#include -#include -#include #include -#include -#include -#include -#include #include #include #include -#include +#include #include #include #include @@ -127,7 +116,6 @@ #include #include #include -#include #include #include #include @@ -177,35 +165,29 @@ #include #include #include +#include #include #include -#include -#include #include #include -#include #include #include #include #include #include -#include #include #include #include -#include #include -#include #include #include #include #include #include -#include #include #include #include -#include +#include #include #include #include @@ -216,5 +198,5 @@ #include #include #ifdef PXR_PYTHON_SUPPORT_ENABLED -#include +#include "pxr/base/tf/pySafePython.h" #endif // PXR_PYTHON_SUPPORT_ENABLED diff --git a/pxr/usdImaging/usdRiImaging/pch.h b/pxr/usdImaging/usdRiImaging/pch.h index bfb934f94d..6ad2d403bb 100644 --- a/pxr/usdImaging/usdRiImaging/pch.h +++ b/pxr/usdImaging/usdRiImaging/pch.h @@ -24,11 +24,162 @@ // WARNING: THIS FILE IS GENERATED. DO NOT EDIT. // +#define TF_MAX_ARITY 7 #include "pxr/pxr.h" -#include "pxr/imaging/hd/tokens.h" -#include "pxr/usdImaging/usdImaging/delegate.h" -#include "pxr/usdImaging/usdImaging/indexProxy.h" -#include "pxr/usdImaging/usdRiImaging/pxrBarnLightFilterAdapter.h" -#include "pxr/usdImaging/usdRiImaging/pxrIntMultLightFilterAdapter.h" -#include "pxr/usdImaging/usdRiImaging/pxrRodLightFilterAdapter.h" -#include "pxr/usdImaging/usdRiImaging/tokens.h" +#include "pxr/base/arch/defines.h" +#if defined(ARCH_OS_DARWIN) +#include +#endif +#if defined(ARCH_OS_LINUX) +#include +#endif +#if defined(ARCH_OS_WINDOWS) +#ifndef WIN32_LEAN_AND_MEAN +#define WIN32_LEAN_AND_MEAN +#endif + +#include +#include +#include +#include +#endif +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#ifdef PXR_PYTHON_SUPPORT_ENABLED +#include +#include +#include +#include +#include +#include +#include +#if defined(__APPLE__) // Fix breakage caused by Python's pyport.h. +#undef tolower +#undef toupper +#endif +#endif // PXR_PYTHON_SUPPORT_ENABLED +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#ifdef PXR_PYTHON_SUPPORT_ENABLED +#include "pxr/base/tf/pySafePython.h" +#endif // PXR_PYTHON_SUPPORT_ENABLED diff --git a/pxr/usdImaging/usdSkelImaging/pch.h b/pxr/usdImaging/usdSkelImaging/pch.h index 3101b0e750..69caaac23b 100644 --- a/pxr/usdImaging/usdSkelImaging/pch.h +++ b/pxr/usdImaging/usdSkelImaging/pch.h @@ -47,6 +47,7 @@ #include #include #include +#include #include #include #include @@ -54,19 +55,20 @@ #include #include #include +#include #include #include #include -#include #include -#include #include #include #include +#include #include #include #include #include +#include #include #include #include @@ -74,6 +76,7 @@ #include #include #include +#include #include #include #include @@ -86,9 +89,7 @@ #include #include #include -#include #include -#include #include #include #include @@ -98,23 +99,12 @@ #include #include #include -#include -#include -#include -#include #include -#include -#include -#include #include -#include -#include -#include -#include #include #include #include -#include +#include #include #include #include @@ -123,7 +113,6 @@ #include #include #include -#include #include #include #include @@ -163,42 +152,37 @@ #include #include #include -#include -#include #include -#include #include #include #include #include #include -#include #include #include #include -#include #include -#include #include #include #include #include #include -#include #include #include #include -#include +#include +#include #include #include #include #include #include +#include +#include #include #include #include #include -#include #ifdef PXR_PYTHON_SUPPORT_ENABLED -#include +#include "pxr/base/tf/pySafePython.h" #endif // PXR_PYTHON_SUPPORT_ENABLED diff --git a/pxr/usdImaging/usdVolImaging/pch.h b/pxr/usdImaging/usdVolImaging/pch.h index 707fef1a11..0fd54d571b 100644 --- a/pxr/usdImaging/usdVolImaging/pch.h +++ b/pxr/usdImaging/usdVolImaging/pch.h @@ -27,32 +27,48 @@ #define TF_MAX_ARITY 7 #include "pxr/pxr.h" #include "pxr/base/arch/defines.h" +#if defined(ARCH_OS_DARWIN) +#include +#endif +#if defined(ARCH_OS_LINUX) +#include +#endif #if defined(ARCH_OS_WINDOWS) #ifndef WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN #endif +#include #include #include #include #endif #include #include +#include +#include +#include #include #include #include #include +#include #include #include +#include +#include #include -#include +#include #include #include +#include #include +#include #include #include #include #include +#include #include #include #include @@ -60,6 +76,7 @@ #include #include #include +#include #include #include #include @@ -67,20 +84,26 @@ #include #include #include +#include #include #include -#include +#include +#include +#include #include #include -#include -#include +#include +#include +#include +#include +#include +#include #include -#include -#include -#include +#include #include #include #include +#include #include #include #include @@ -89,30 +112,72 @@ #include #include #include +#include +#include #include #include #include #include #include #include +#include #include #include #include #include +#include #include #include #include #include #include #include -#include +#ifdef PXR_PYTHON_SUPPORT_ENABLED +#include +#include +#include +#include +#include +#include +#include +#if defined(__APPLE__) // Fix breakage caused by Python's pyport.h. +#undef tolower +#undef toupper +#endif +#endif // PXR_PYTHON_SUPPORT_ENABLED +#include +#include +#include #include +#include +#include +#include +#include +#include +#include #include #include #include #include #include +#include +#include #include +#include #include +#include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#ifdef PXR_PYTHON_SUPPORT_ENABLED +#include "pxr/base/tf/pySafePython.h" +#endif // PXR_PYTHON_SUPPORT_ENABLED diff --git a/pxr/usdImaging/usdviewq/pch.h b/pxr/usdImaging/usdviewq/pch.h index 9a48f7babd..1e55e66893 100644 --- a/pxr/usdImaging/usdviewq/pch.h +++ b/pxr/usdImaging/usdviewq/pch.h @@ -47,6 +47,7 @@ #include #include #include +#include #include #include #include @@ -58,16 +59,16 @@ #include #include #include -#include #include -#include #include #include #include +#include #include #include #include #include +#include #include #include #include @@ -75,6 +76,7 @@ #include #include #include +#include #include #include #include @@ -86,8 +88,6 @@ #include #include #include -#include -#include #include #include #include @@ -97,22 +97,12 @@ #include #include #include -#include -#include -#include -#include #include -#include -#include -#include #include -#include -#include -#include -#include +#include #include #include -#include +#include #include #include #include @@ -121,7 +111,6 @@ #include #include #include -#include #include #include #include @@ -161,33 +150,26 @@ #endif #endif // PXR_PYTHON_SUPPORT_ENABLED #include -#include #include -#include -#include #include #include -#include #include #include #include #include #include -#include #include #include #include -#include #include -#include #include #include #include #include #include -#include #include -#include +#include +#include #include #include #include @@ -196,5 +178,5 @@ #include #include #ifdef PXR_PYTHON_SUPPORT_ENABLED -#include +#include "pxr/base/tf/pySafePython.h" #endif // PXR_PYTHON_SUPPORT_ENABLED diff --git a/third_party/renderman-22/plugin/rmanArgsParser/pch.h b/third_party/renderman-22/plugin/rmanArgsParser/pch.h index 2e81c96a79..63c182eb75 100644 --- a/third_party/renderman-22/plugin/rmanArgsParser/pch.h +++ b/third_party/renderman-22/plugin/rmanArgsParser/pch.h @@ -45,6 +45,7 @@ #endif #include #include +#include #include #include #include @@ -53,11 +54,12 @@ #include #include #include -#include +#include +#include #include -#include #include #include +#include #include #include #include @@ -78,26 +80,16 @@ #include #include #include -#include #include #include #include #include #include #include -#include -#include -#include -#include #include #include -#include -#include -#include #include #include -#include -#include #include #include #include @@ -133,24 +125,17 @@ #undef toupper #endif #endif // PXR_PYTHON_SUPPORT_ENABLED -#include #include -#include #include #include #include #include #include -#include #include #include #include #include #include -#include -#include -#include -#include #ifdef PXR_PYTHON_SUPPORT_ENABLED -#include +#include "pxr/base/tf/pySafePython.h" #endif // PXR_PYTHON_SUPPORT_ENABLED diff --git a/third_party/renderman-23/plugin/rmanArgsParser/pch.h b/third_party/renderman-23/plugin/rmanArgsParser/pch.h index 2e81c96a79..63c182eb75 100644 --- a/third_party/renderman-23/plugin/rmanArgsParser/pch.h +++ b/third_party/renderman-23/plugin/rmanArgsParser/pch.h @@ -45,6 +45,7 @@ #endif #include #include +#include #include #include #include @@ -53,11 +54,12 @@ #include #include #include -#include +#include +#include #include -#include #include #include +#include #include #include #include @@ -78,26 +80,16 @@ #include #include #include -#include #include #include #include #include #include #include -#include -#include -#include -#include #include #include -#include -#include -#include #include #include -#include -#include #include #include #include @@ -133,24 +125,17 @@ #undef toupper #endif #endif // PXR_PYTHON_SUPPORT_ENABLED -#include #include -#include #include #include #include #include #include -#include #include #include #include #include #include -#include -#include -#include -#include #ifdef PXR_PYTHON_SUPPORT_ENABLED -#include +#include "pxr/base/tf/pySafePython.h" #endif // PXR_PYTHON_SUPPORT_ENABLED