Add convenience mayaHydra.h include to api.h

Autodesk · Jun 12, 2024 · 664a0a0 · 664a0a0
1 parent c47d2e0
commit 664a0a0
Show file tree

Hide file tree

Showing 11 changed files with 4 additions and 10 deletions.
diff --git a/lib/mayaHydra/hydraExtensions/api.h b/lib/mayaHydra/hydraExtensions/api.h
@@ -37,4 +37,8 @@
 #endif
 #endif
 
+// Convenience symbol versioning include: because api.h is widely
+// included, this reduces the need to explicitly include mayaHydra.h.
+#include <mayaHydraLib/mayaHydra.h>
+
 #endif // MAYAHYDRALIB_API_H
diff --git a/lib/mayaHydra/hydraExtensions/hydraUtils.h b/lib/mayaHydra/hydraExtensions/hydraUtils.h
@@ -19,7 +19,6 @@
 #define MAYAHYDRALIB_HYDRA_UTILS_H
 
 #include <mayaHydraLib/api.h>
-#include <mayaHydraLib/mayaHydra.h>
 
 #include <pxr/base/gf/matrix4d.h>
 #include <pxr/base/gf/vec3f.h>

diff --git a/lib/mayaHydra/hydraExtensions/mayaUtils.h b/lib/mayaHydra/hydraExtensions/mayaUtils.h
@@ -18,7 +18,6 @@
 #define MAYAHYDRALIB_MAYA_UTILS_H
 
 #include <mayaHydraLib/api.h>
-#include <mayaHydraLib/mayaHydra.h>
 
 #include <maya/MApiNamespace.h>
 #include <maya/MFnDependencyNode.h>

diff --git a/lib/mayaHydra/hydraExtensions/mhLeadObjectPathTracker.h b/lib/mayaHydra/hydraExtensions/mhLeadObjectPathTracker.h
@@ -18,7 +18,6 @@
 
 //Local headers
 #include "mayaHydraLib/api.h"
-#include "mayaHydraLib/mayaHydra.h"
 #include "mayaHydraLib/sceneIndex/mhDirtyLeadObjectSceneIndex.h"
 
 //Flow viewport headers

diff --git a/lib/mayaHydra/hydraExtensions/mhWireframeColorInterfaceImp.h b/lib/mayaHydra/hydraExtensions/mhWireframeColorInterfaceImp.h
@@ -18,7 +18,6 @@
 
 //Local headers
 #include <mayaHydraLib/api.h>
-#include <mayaHydraLib/mayaHydra.h>
 #include <mayaHydraLib/mhLeadObjectPathTracker.h>
 
 //Flow viewport headers

diff --git a/lib/mayaHydra/hydraExtensions/mixedUtils.h b/lib/mayaHydra/hydraExtensions/mixedUtils.h
@@ -19,7 +19,6 @@
 #define MAYAHYDRALIB_MIXED_UTILS_H
 
 #include <mayaHydraLib/api.h>
-#include <mayaHydraLib/mayaHydra.h>
 
 #include <pxr/base/gf/matrix4d.h>
 #include <pxr/base/tf/token.h>

diff --git a/...Hydra/hydraExtensions/sceneIndex/mayaHydraMayaDataProducerSceneIndexDataConcreteFactory.h b/...Hydra/hydraExtensions/sceneIndex/mayaHydraMayaDataProducerSceneIndexDataConcreteFactory.h
@@ -18,7 +18,6 @@
 
 //MayaHydra headers
 #include "mayaHydraLib/api.h"
-#include "mayaHydraLib/mayaHydra.h"
 
 //Flow Viewport headers
 #include <flowViewport/API/perViewportSceneIndicesData/fvpDataProducerSceneIndexDataAbstractFactory.h>

diff --git a/...ayaHydra/hydraExtensions/sceneIndex/mayaHydraMayaFilteringSceneIndexDataConcreteFactory.h b/...ayaHydra/hydraExtensions/sceneIndex/mayaHydraMayaFilteringSceneIndexDataConcreteFactory.h
@@ -18,7 +18,6 @@
 
 //MayaHydra headers
 #include "mayaHydraLib/api.h"
-#include "mayaHydraLib/mayaHydra.h"
 
 //Flow Viewport headers
 #include "flowViewport/API/perViewportSceneIndicesData/fvpFilteringSceneIndexDataAbstractFactory.h"

diff --git a/lib/mayaHydra/hydraExtensions/sceneIndex/mayaHydraSceneIndexDataFactoriesSetup.h b/lib/mayaHydra/hydraExtensions/sceneIndex/mayaHydraSceneIndexDataFactoriesSetup.h
@@ -18,7 +18,6 @@
 
 //Local headers
 #include "mayaHydraLib/api.h"
-#include "mayaHydraLib/mayaHydra.h"
 
 namespace MAYAHYDRA_NS_DEF{
 

diff --git a/lib/mayaHydra/hydraExtensions/sceneIndex/mhDirtyLeadObjectSceneIndex.h b/lib/mayaHydra/hydraExtensions/sceneIndex/mhDirtyLeadObjectSceneIndex.h
@@ -18,7 +18,6 @@
 
 //MayaHydra headers
 #include "mayaHydraLib/api.h"
-#include "mayaHydraLib/mayaHydra.h"
 
 // Flow Viewport Toolkit headers.
 #include "flowViewport/sceneIndex/fvpSceneIndexUtils.h"

diff --git a/lib/mayaHydra/hydraExtensions/sceneIndex/mhMayaUsdProxyShapeSceneIndex.h b/lib/mayaHydra/hydraExtensions/sceneIndex/mhMayaUsdProxyShapeSceneIndex.h
@@ -19,7 +19,6 @@
 #if defined(MAYAHYDRALIB_MAYAUSDAPI_ENABLED)
 //MayaHydra headers
 #include "mayaHydraLib/api.h"
-#include "mayaHydraLib/mayaHydra.h"
 
 //MayaUsdAPI headers
 #include <mayaUsdAPI/proxyStage.h>