Skip to content

Commit

Permalink
Update to ufe 0.4.34
Browse files Browse the repository at this point in the history
  • Loading branch information
alicedegirolamo committed Nov 4, 2022
1 parent 69563dd commit 9fc697d
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
6 changes: 3 additions & 3 deletions lib/mayaUsd/ufe/UsdAttributes.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,7 @@ bool UsdAttributes::hasAttribute(const std::string& name) const

#ifdef UFE_V4_FEATURES_AVAILABLE
#if (UFE_PREVIEW_VERSION_NUM >= 4024)
#if (UFE_PREVIEW_VERSION_NUM >= 4033)
#if (UFE_PREVIEW_VERSION_NUM >= 4034)
Ufe::AddAttributeUndoableCommand::Ptr
UsdAttributes::addAttributeCmd(const std::string& name, const Ufe::Attribute::Type& type)
{
Expand All @@ -328,7 +328,7 @@ Ufe::UndoableCommand::Ptr UsdAttributes::removeAttributeCmd(const std::string& n
return UsdRemoveAttributeCommand::create(fItem, name);
}
#endif
#if (UFE_PREVIEW_VERSION_NUM >= 4033)
#if (UFE_PREVIEW_VERSION_NUM >= 4034)
Ufe::RenameAttributeUndoableCommand::Ptr
UsdAttributes::renameAttributeCmd(const std::string& originalName, const std::string& newName)
{
Expand Down Expand Up @@ -488,7 +488,7 @@ bool UsdAttributes::doRemoveAttribute(const UsdSceneItem::Ptr& item, const std::
return false;
}
#endif
#if (UFE_PREVIEW_VERSION_NUM >= 4033)
#if (UFE_PREVIEW_VERSION_NUM >= 4034)
bool UsdAttributes::canRenameAttribute(
const UsdSceneItem::Ptr& sceneItem,
const std::string& originalName,
Expand Down
6 changes: 3 additions & 3 deletions lib/mayaUsd/ufe/UsdAttributes.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class UsdAttributes : public Ufe::Attributes
bool hasAttribute(const std::string& name) const override;
#ifdef UFE_V4_FEATURES_AVAILABLE
#if (UFE_PREVIEW_VERSION_NUM >= 4024)
#if (UFE_PREVIEW_VERSION_NUM >= 4033)
#if (UFE_PREVIEW_VERSION_NUM >= 4034)
Ufe::AddAttributeUndoableCommand::Ptr
addAttributeCmd(const std::string& name, const Ufe::Attribute::Type& type) override;
#else
Expand All @@ -69,7 +69,7 @@ class UsdAttributes : public Ufe::Attributes
Ufe::UndoableCommand::Ptr removeAttributeCmd(const std::string& name) override;
#endif

#if (UFE_PREVIEW_VERSION_NUM >= 4033)
#if (UFE_PREVIEW_VERSION_NUM >= 4034)
Ufe::RenameAttributeUndoableCommand::Ptr
renameAttributeCmd(const std::string& originalName, const std::string& newName) override;
#endif
Expand All @@ -89,7 +89,7 @@ class UsdAttributes : public Ufe::Attributes
static bool canRemoveAttribute(const UsdSceneItem::Ptr& item, const std::string& name);
static bool doRemoveAttribute(const UsdSceneItem::Ptr& item, const std::string& name);
#endif
#if (UFE_PREVIEW_VERSION_NUM >= 4033)
#if (UFE_PREVIEW_VERSION_NUM >= 4034)
static bool canRenameAttribute(
const UsdSceneItem::Ptr& sceneItem,
const std::string& originalName,
Expand Down
4 changes: 2 additions & 2 deletions lib/mayaUsd/ufe/UsdUndoAttributesCommands.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ UsdAddAttributeCommand::UsdAddAttributeCommand(
const UsdSceneItem::Ptr& sceneItem,
const std::string& name,
const Ufe::Attribute::Type& type)
#if (UFE_PREVIEW_VERSION_NUM >= 4033)
#if (UFE_PREVIEW_VERSION_NUM >= 4034)
: UsdUndoableCommand<Ufe::AddAttributeUndoableCommand>()
#else
: UsdUndoableCommand<Ufe::AddAttributeCommand>()
Expand Down Expand Up @@ -117,7 +117,7 @@ std::string UsdRemoveAttributeCommand::commandString() const
return std::string("RemoveAttribute ") + _name + " " + Ufe::PathString::string(_sceneItemPath);
}
#endif
#if (UFE_PREVIEW_VERSION_NUM >= 4033)
#if (UFE_PREVIEW_VERSION_NUM >= 4034)
UsdRenameAttributeCommand::UsdRenameAttributeCommand(
const UsdSceneItem::Ptr& sceneItem,
const std::string& originalName,
Expand Down
4 changes: 2 additions & 2 deletions lib/mayaUsd/ufe/UsdUndoAttributesCommands.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ namespace ufe {
//! \brief Implementation of AddAttributeCommand
class UsdAddAttributeCommand
:
#if (UFE_PREVIEW_VERSION_NUM >= 4033)
#if (UFE_PREVIEW_VERSION_NUM >= 4034)
public UsdUndoableCommand<Ufe::AddAttributeUndoableCommand>
#else
public UsdUndoableCommand<Ufe::AddAttributeCommand>
Expand Down Expand Up @@ -117,7 +117,7 @@ class UsdRemoveAttributeCommand : public UsdUndoableCommand<Ufe::UndoableCommand
}; // UsdRemoveAttributeCommand

#ifdef UFE_V4_FEATURES_AVAILABLE
#if (UFE_PREVIEW_VERSION_NUM >= 4033)
#if (UFE_PREVIEW_VERSION_NUM >= 4034)
//! \brief Implementation of RenameAttributeCommand
class UsdRenameAttributeCommand : public UsdUndoableCommand<Ufe::RenameAttributeUndoableCommand>
{
Expand Down
2 changes: 1 addition & 1 deletion test/lib/ufe/testAttributes.py
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ def testUniqueNameAttribute(self):
attr = ball35Attrs.attribute("MyAttribute1")
self.assertEqual(repr(attr),"ufe.AttributeString(<|transform1|proxyShape1,/Room_set/Props/Ball_35.MyAttribute1>)")

@unittest.skipIf(os.getenv('UFE_PREVIEW_VERSION_NUM', '0000') < '4033', 'Test for UFE preview version 0.4.33 and later')
@unittest.skipIf(os.getenv('UFE_PREVIEW_VERSION_NUM', '0000') < '4034', 'Test for UFE preview version 0.4.34 and later')
def testRenamingAttribute(self):
'''Test renaming an attribute'''

Expand Down

0 comments on commit 9fc697d

Please sign in to comment.