Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Address remaining feedback in lib/usd and plugin/adsk #408

Merged
merged 3 commits into from
Apr 7, 2020
Merged

Address remaining feedback in lib/usd and plugin/adsk #408

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9aaae0c
fix conditional orders in lib/usd and plugin/adsk
Apr 6, 2020
6b66aba
fix grouping headers.
Apr 7, 2020
c6eecc5
Address feedbacks:
Apr 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions lib/usd/hdMaya/adapters/materialAdapter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,16 +35,16 @@
#include <pxr/usdImaging/usdImaging/tokens.h>
#include <pxr/usdImaging/usdImagingGL/package.h>

#if USD_VERSION_NUM >= 1911
#include <pxr/imaging/hdSt/textureResourceHandle.h>
#endif

#include <hdMaya/adapters/adapterRegistry.h>
#include <hdMaya/adapters/materialNetworkConverter.h>
#include <hdMaya/adapters/mayaAttrs.h>
#include <hdMaya/adapters/tokens.h>
#include <hdMaya/utils.h>

#if USD_VERSION_NUM >= 1911
#include <pxr/imaging/hdSt/textureResourceHandle.h>
#endif

PXR_NAMESPACE_OPEN_SCOPE

namespace {
Expand Down
14 changes: 7 additions & 7 deletions lib/usd/hdMaya/adapters/proxyAdapter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,18 @@
#include <maya/MTime.h>
#include <maya/MGlobal.h>

#if WANT_UFE_BUILD
#include <ufe/rtid.h>
#include <ufe/runTimeMgr.h>
#endif // WANT_UFE_BUILD

#include <mayaUsd/nodes/proxyShapeBase.h>

#include <hdMaya/adapters/adapterRegistry.h>
#include <hdMaya/debugCodes.h>
#include <hdMaya/delegates/proxyDelegate.h>
#include <hdMaya/delegates/sceneDelegate.h>

#include <mayaUsd/nodes/proxyShapeBase.h>

#if WANT_UFE_BUILD
#include <ufe/rtid.h>
#include <ufe/runTimeMgr.h>
#endif // WANT_UFE_BUILD

PXR_NAMESPACE_OPEN_SCOPE

HdMayaProxyAdapter::HdMayaProxyAdapter(
Expand Down
6 changes: 3 additions & 3 deletions lib/usd/hdMaya/delegates/delegate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@
#include <pxr/imaging/hdx/taskController.h>
#include <pxr/usd/sdf/path.h>

#include <hdMaya/api.h>
#include <hdMaya/delegates/params.h>

#if USD_VERSION_NUM >= 1911
#include <pxr/imaging/hd/rendererPlugin.h>
#else
Expand All @@ -43,9 +46,6 @@ PXR_NAMESPACE_CLOSE_SCOPE
#include <ufe/selection.h>
#endif // WANT_UFE_BUILD

#include <hdMaya/api.h>
#include <hdMaya/delegates/params.h>

PXR_NAMESPACE_OPEN_SCOPE

class HdMayaDelegate {
Expand Down
12 changes: 6 additions & 6 deletions lib/usd/hdMaya/delegates/proxyDelegate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,17 @@
#include <pxr/base/tf/envSetting.h>
#include <pxr/base/tf/type.h>

#include <hdMaya/adapters/proxyAdapter.h>
#include <hdMaya/debugCodes.h>
#include <hdMaya/delegates/delegateRegistry.h>

#include <mayaUsd/nodes/proxyShapeBase.h>

#if WANT_UFE_BUILD
#include <ufe/rtid.h>
#include <ufe/runTimeMgr.h>
#endif // WANT_UFE_BUILD

#include <mayaUsd/nodes/proxyShapeBase.h>

#include <hdMaya/adapters/proxyAdapter.h>
#include <hdMaya/debugCodes.h>
#include <hdMaya/delegates/delegateRegistry.h>

PXR_NAMESPACE_OPEN_SCOPE

TF_DEFINE_PRIVATE_TOKENS(_tokens, (HdMayaProxyDelegate));
Expand Down
4 changes: 2 additions & 2 deletions lib/usd/hdMaya/delegates/proxyDelegate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@
#include <pxr/usd/usd/stage.h>
#include <pxr/usdImaging/usdImaging/delegate.h>

#include <hdMaya/delegates/delegate.h>

#if WANT_UFE_BUILD
#include <ufe/selection.h>
#endif // WANT_UFE_BUILD

#include <hdMaya/delegates/delegate.h>

PXR_NAMESPACE_OPEN_SCOPE

class HdMayaProxyAdapter;
Expand Down
18 changes: 9 additions & 9 deletions plugin/adsk/plugin/plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,6 @@
#include <pxr/base/plug/plugin.h>
#include <pxr/base/plug/registry.h>

#include <mayaUsd/utils/undoHelperCommand.h>
#if defined(WANT_QT_BUILD)
#include <mayaUsdUI/ui/USDImportDialogCmd.h>
#endif

#if defined(WANT_UFE_BUILD)
#include <mayaUsd/ufe/Global.h>
#endif

#include <mayaUsd/base/api.h>
#include <mayaUsd/nodes/proxyShapeBase.h>
#include <mayaUsd/nodes/proxyShapePlugin.h>
Expand All @@ -44,6 +35,15 @@
#include "importTranslator.h"
#include "ProxyShape.h"

#include <mayaUsd/utils/undoHelperCommand.h>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This include is not part of a conditional and should stay with the mayaUsd group above.

#if defined(WANT_QT_BUILD)
#include <mayaUsdUI/ui/USDImportDialogCmd.h>
#endif

#if defined(WANT_UFE_BUILD)
#include <mayaUsd/ufe/Global.h>
#endif

PXR_NAMESPACE_USING_DIRECTIVE

MAYAUSD_PLUGIN_PUBLIC
Expand Down