Skip to content

Commit

Permalink
Some files got in without clang-format applied
Browse files Browse the repository at this point in the history
  • Loading branch information
Krystian Ligenza committed Nov 27, 2020
1 parent 3008626 commit 2ce2ed9
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 6 deletions.
4 changes: 2 additions & 2 deletions lib/mayaUsd/commands/baseListShadingModesCommand.cpp
Expand Up @@ -114,15 +114,15 @@ MStatus MayaUSDListShadingModesCommand::doIt(const MArgList& args)
// This is to be used when importing via the dialog. Finer grained import is available at
// the command level.
//
for (const auto &c : UsdMayaShadingModeRegistry::ListMaterialConversions()) {
for (const auto& c : UsdMayaShadingModeRegistry::ListMaterialConversions()) {
if (c != UsdImagingTokens->UsdPreviewSurface) {
auto const& info = UsdMayaShadingModeRegistry::GetMaterialConversionInfo(c);
if (info.hasImporter) {
appendToResult(info.niceName.GetText());
}
}
}
for (const auto &s : UsdMayaShadingModeRegistry::ListImporters()) {
for (const auto& s : UsdMayaShadingModeRegistry::ListImporters()) {
if (s != UsdMayaShadingModeTokens->useRegistry
&& s != UsdMayaShadingModeTokens->displayColor) {
appendToResult(UsdMayaShadingModeRegistry::GetImporterNiceName(s).c_str());
Expand Down
2 changes: 1 addition & 1 deletion lib/mayaUsd/render/vp2RenderDelegate/material.cpp
Expand Up @@ -432,7 +432,7 @@ _LoadTexture(const std::string& path, bool& isColorSpaceSRGB, MFloatArray& uvSca
#if USD_VERSION_NUM >= 2102
HioImageSharedPtr image = HioImage::OpenForReading(path);
#else
GlfImageSharedPtr image = GlfImage::OpenForReading(path);
GlfImageSharedPtr image = GlfImage::OpenForReading(path);
#endif
if (!TF_VERIFY(image)) {
return nullptr;
Expand Down
Expand Up @@ -757,7 +757,7 @@ bool ProxyRenderDelegate::getInstancedSelectionPath(
// once per selection update to avoid cost of executing MEL command or searching optionVar for
// each intersection.
#if defined(MAYA_ENABLE_UPDATE_FOR_SELECTION)
const TfToken& selectionKind = _selectionKind;
const TfToken& selectionKind = _selectionKind;
#if UFE_PREVIEW_VERSION_NUM < 2027 // #ifndef UFE_V2_FEATURES_AVAILABLE
const MGlobal::ListAdjustment& listAdjustment = _globalListAdjustment;
#endif
Expand Down
3 changes: 1 addition & 2 deletions lib/mayaUsd/ufe/Global.cpp
Expand Up @@ -121,8 +121,7 @@ MStatus initialize()
handlers.object3dHandler = UsdObject3dHandler::create();
handlers.contextOpsHandler = UsdContextOpsHandler::create();
handlers.uiInfoHandler = UsdUIInfoHandler::create();
g_USDRtid = Ufe::RunTimeMgr::instance().register_(
kUSDRunTimeName, handlers);
g_USDRtid = Ufe::RunTimeMgr::instance().register_(kUSDRunTimeName, handlers);
#else
auto usdHierHandler = UsdHierarchyHandler::create();
auto usdTrans3dHandler = UsdTransform3dHandler::create();
Expand Down

0 comments on commit 2ce2ed9

Please sign in to comment.