diff --git a/lib/mayaUsd/ufe/UsdAttributes.cpp b/lib/mayaUsd/ufe/UsdAttributes.cpp index 3683f2a9f9..720615af10 100644 --- a/lib/mayaUsd/ufe/UsdAttributes.cpp +++ b/lib/mayaUsd/ufe/UsdAttributes.cpp @@ -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) { @@ -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) { @@ -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, diff --git a/lib/mayaUsd/ufe/UsdAttributes.h b/lib/mayaUsd/ufe/UsdAttributes.h index 049eced830..57eb360ed7 100644 --- a/lib/mayaUsd/ufe/UsdAttributes.h +++ b/lib/mayaUsd/ufe/UsdAttributes.h @@ -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 @@ -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 @@ -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, diff --git a/lib/mayaUsd/ufe/UsdUndoAttributesCommands.cpp b/lib/mayaUsd/ufe/UsdUndoAttributesCommands.cpp index ef97c99725..2f3117d73d 100644 --- a/lib/mayaUsd/ufe/UsdUndoAttributesCommands.cpp +++ b/lib/mayaUsd/ufe/UsdUndoAttributesCommands.cpp @@ -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() #else : UsdUndoableCommand() @@ -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, diff --git a/lib/mayaUsd/ufe/UsdUndoAttributesCommands.h b/lib/mayaUsd/ufe/UsdUndoAttributesCommands.h index c5e8a8af95..e5f973cdff 100644 --- a/lib/mayaUsd/ufe/UsdUndoAttributesCommands.h +++ b/lib/mayaUsd/ufe/UsdUndoAttributesCommands.h @@ -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 #else public UsdUndoableCommand @@ -117,7 +117,7 @@ class UsdRemoveAttributeCommand : public UsdUndoableCommand= 4033) +#if (UFE_PREVIEW_VERSION_NUM >= 4034) //! \brief Implementation of RenameAttributeCommand class UsdRenameAttributeCommand : public UsdUndoableCommand { diff --git a/test/lib/ufe/testAttributes.py b/test/lib/ufe/testAttributes.py index 8578bf70f1..f3cae163ec 100644 --- a/test/lib/ufe/testAttributes.py +++ b/test/lib/ufe/testAttributes.py @@ -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'''