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.

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

Maya 105566/serialize usd edits #1152

Merged
merged 8 commits into from
Feb 10, 2021
13 changes: 12 additions & 1 deletion lib/mayaUsd/base/tokens.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,18 @@ PXR_NAMESPACE_OPEN_SCOPE
/* resolve to individual point instances, or to */ \
/* "Prototypes" which will resolve to the prim */ \
/* that is being instanced by the point instance. */ \
((PointInstancesPickMode, "mayaUsd_PointInstancesPickMode"))
((PointInstancesPickMode, "mayaUsd_PointInstancesPickMode")) \
/* When saving as .usd, should the internal format be binary */ \
((SaveLayerFormatArgBinaryOption, "mayaUsd_SaveLayerFormatArgBinaryOption")) \
/* Option for what to do with Usd edits when the current */ \
/* Maya scene is about to be saved. optionVar values are: */ \
/* 1: save all edits back to usd files. */ \
/* 2: export the dirty usd layers to Maya string attributes */ \
/* to be serialized to the Maya file. */ \
/* 3: ignore all Usd edits. */ \
((SerializedUsdEditsLocation, "mayaUsd_SerializedUsdEditsLocation")) \
/* optionVar to force a prompt on every save */ \
((SerializedUsdEditsLocationPrompt, "mayaUsd_SerializedUsdEditsLocationPrompt"))
// clang-format on

TF_DECLARE_PUBLIC_TOKENS(MayaUsdOptionVars, MAYAUSD_CORE_PUBLIC, MAYA_USD_OPTIONVAR_TOKENS);
Expand Down
10 changes: 10 additions & 0 deletions lib/mayaUsd/nodes/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,16 @@ set(HEADERS
usdPrimProvider.h
)

if (UFE_FOUND)
target_sources(${PROJECT_NAME}
PRIVATE
layerManager.cpp
)
list(APPEND HEADERS
layerManager.h
)
endif()

# -----------------------------------------------------------------------------
# promoted headers
# -----------------------------------------------------------------------------
Expand Down
Loading