[GafferHQ/gaffer] a39cdf: ArrayPlug : Fix loading of dynamic ArrayPlugs save...
1 view
Skip to first unread message
Murray Stevenson
Dec 10, 2024, 3:13:35 PM12/10/24
to gaffer-...@googlegroups.com
Branch: refs/heads/1.4_maintenance
Home: https://github.com/GafferHQ/gaffer
Commit: a39cdf0a1b10b0731c527a319e7fdc15414c41fe
https://github.com/GafferHQ/gaffer/commit/a39cdf0a1b10b0731c527a319e7fdc15414c41fe
Author: John Haddon <thehad...@gmail.com>
Date: 2024-12-10 (Tue, 10 Dec 2024)
Changed paths:
M Changes.md
M python/GafferSceneTest/ParentTest.py
A python/GafferSceneTest/scripts/promotedArrayPlug-1.5.1.0.gfr
M python/GafferTest/ArrayPlugTest.py
A python/GafferTest/scripts/arrayPlugWithOutputPrototype-1.5.1.0.gfr
A startup/Gaffer/arrayPlugCompatibility.py
Log Message:
-----------
ArrayPlug : Fix loading of dynamic ArrayPlugs saved in Gaffer 1.5+
We changed the name of the `element` argument, and need to account for that in a compatibility shim. A further complication is that in 1.5 the ArrayPlug doesn't care what direction the prototype has, because it is just used as a factory via `createCounterpart()` which re-specifies the direction. But in 1.4 it is used as the first element of the array as well, so we need to adjust direction if necessary.
Commit: fe384e413de3fc3ae26d2dec785d6b85d8c75a7e
https://github.com/GafferHQ/gaffer/commit/fe384e413de3fc3ae26d2dec785d6b85d8c75a7e
Author: Murray Stevenson <50844517+mur...@users.noreply.github.com>
Date: 2024-12-10 (Tue, 10 Dec 2024)
Changed paths:
M Changes.md
M python/GafferSceneTest/ParentTest.py
A python/GafferSceneTest/scripts/promotedArrayPlug-1.5.1.0.gfr
M python/GafferTest/ArrayPlugTest.py
A python/GafferTest/scripts/arrayPlugWithOutputPrototype-1.5.1.0.gfr
A startup/Gaffer/arrayPlugCompatibility.py
Log Message:
-----------
Merge pull request #6179 from johnhaddon/arrayPlugCompat
ArrayPlug : Fix loading of dynamic ArrayPlugs saved in Gaffer 1.5+
Compare: https://github.com/GafferHQ/gaffer/compare/f3b789892b3a...fe384e413de3
To unsubscribe from these emails, change your notification settings at https://github.com/GafferHQ/gaffer/settings/notifications
Home: https://github.com/GafferHQ/gaffer
Commit: a39cdf0a1b10b0731c527a319e7fdc15414c41fe
https://github.com/GafferHQ/gaffer/commit/a39cdf0a1b10b0731c527a319e7fdc15414c41fe
Author: John Haddon <thehad...@gmail.com>
Date: 2024-12-10 (Tue, 10 Dec 2024)
Changed paths:
M Changes.md
M python/GafferSceneTest/ParentTest.py
A python/GafferSceneTest/scripts/promotedArrayPlug-1.5.1.0.gfr
M python/GafferTest/ArrayPlugTest.py
A python/GafferTest/scripts/arrayPlugWithOutputPrototype-1.5.1.0.gfr
A startup/Gaffer/arrayPlugCompatibility.py
Log Message:
-----------
ArrayPlug : Fix loading of dynamic ArrayPlugs saved in Gaffer 1.5+
We changed the name of the `element` argument, and need to account for that in a compatibility shim. A further complication is that in 1.5 the ArrayPlug doesn't care what direction the prototype has, because it is just used as a factory via `createCounterpart()` which re-specifies the direction. But in 1.4 it is used as the first element of the array as well, so we need to adjust direction if necessary.
Commit: fe384e413de3fc3ae26d2dec785d6b85d8c75a7e
https://github.com/GafferHQ/gaffer/commit/fe384e413de3fc3ae26d2dec785d6b85d8c75a7e
Author: Murray Stevenson <50844517+mur...@users.noreply.github.com>
Date: 2024-12-10 (Tue, 10 Dec 2024)
Changed paths:
M Changes.md
M python/GafferSceneTest/ParentTest.py
A python/GafferSceneTest/scripts/promotedArrayPlug-1.5.1.0.gfr
M python/GafferTest/ArrayPlugTest.py
A python/GafferTest/scripts/arrayPlugWithOutputPrototype-1.5.1.0.gfr
A startup/Gaffer/arrayPlugCompatibility.py
Log Message:
-----------
Merge pull request #6179 from johnhaddon/arrayPlugCompat
ArrayPlug : Fix loading of dynamic ArrayPlugs saved in Gaffer 1.5+
Compare: https://github.com/GafferHQ/gaffer/compare/f3b789892b3a...fe384e413de3
To unsubscribe from these emails, change your notification settings at https://github.com/GafferHQ/gaffer/settings/notifications
John Haddon
Dec 13, 2024, 4:24:22 AM12/13/24
to gaffer-...@googlegroups.com
Branch: refs/heads/1.5_maintenance
https://github.com/GafferHQ/gaffer/commit/1d8403c912e060f0a31a94ee676ed2e9335ea9e2
Log Message:
-----------
RandomChoiceUI : Fix handling of non-ValuePlugs
Right-clicking on (for example) a `ShaderAssignment.shader` plug in the NodeEditor was leading to the following warning :
```
ERROR : Plug menu : Traceback (most recent call last):
ERROR : File "/home/john/dev/build/gaffer-1.4/python/GafferUI/PlugValueWidget.py", line 994, in __combiner
ERROR : next( results )
ERROR : IECore.Exception: Traceback (most recent call last):
ERROR : File "/home/john/dev/build/gaffer-1.4/python/GafferUI/RandomChoiceUI.py", line 245, in __popupMenu
ERROR : if not Gaffer.RandomChoice.canSetup( plug ) :
ERROR : Boost.Python.ArgumentError: Python argument types in
ERROR : RandomChoice.canSetup(ShaderPlug)
ERROR : did not match C++ signature:
ERROR : canSetup(Gaffer::ValuePlug const*)
```
Commit: fe384e413de3fc3ae26d2dec785d6b85d8c75a7e
https://github.com/GafferHQ/gaffer/commit/fe384e413de3fc3ae26d2dec785d6b85d8c75a7e
Author: Murray Stevenson <50844517+mur...@users.noreply.github.com>
Date: 2024-12-10 (Tue, 10 Dec 2024)
Changed paths:
M Changes.md
M python/GafferSceneTest/ParentTest.py
A python/GafferSceneTest/scripts/promotedArrayPlug-1.5.1.0.gfr
M python/GafferTest/ArrayPlugTest.py
A python/GafferTest/scripts/arrayPlugWithOutputPrototype-1.5.1.0.gfr
A startup/Gaffer/arrayPlugCompatibility.py
Log Message:
-----------
Merge pull request #6179 from johnhaddon/arrayPlugCompat
ArrayPlug : Fix loading of dynamic ArrayPlugs saved in Gaffer 1.5+
Commit: 2e0c9ca5eefc9ad9702a2452f88790a6bf8536cb
https://github.com/GafferHQ/gaffer/commit/2e0c9ca5eefc9ad9702a2452f88790a6bf8536cb
Author: Eric Mehl <er...@cinesite.com>
Log Message:
-----------
Merge pull request #6180 from johnhaddon/randomChoiceUIFix
RandomChoiceUI : Fix handling of non-ValuePlugs
Commit: 97c574bc3ea746c951481ef72233fda9db4b99a2
https://github.com/GafferHQ/gaffer/commit/97c574bc3ea746c951481ef72233fda9db4b99a2
Author: John Haddon <thehad...@gmail.com>
Date: 2024-12-13 (Fri, 13 Dec 2024)
Changed paths:
M Changes.md
M SConstruct
Log Message:
-----------
Bump version to 1.4.15.3
Commit: 1c65f6315b50b07dbb16605963e8624edb0885d7
https://github.com/GafferHQ/gaffer/commit/1c65f6315b50b07dbb16605963e8624edb0885d7
Author: John Haddon <thehad...@gmail.com>
Date: 2024-12-13 (Fri, 13 Dec 2024)
Changed paths:
M Changes.md
M python/GafferSceneTest/ParentTest.py
A python/GafferSceneTest/scripts/promotedArrayPlug-1.5.1.0.gfr
M python/GafferTest/ArrayPlugTest.py
A python/GafferTest/scripts/arrayPlugWithOutputPrototype-1.5.1.0.gfr
M python/GafferUI/RandomChoiceUI.py
Log Message:
-----------
Merge branch '1.4_maintenance' into 1.5_maintenance
Compare: https://github.com/GafferHQ/gaffer/compare/1dc7d84750fe...1c65f6315b50
Home: https://github.com/GafferHQ/gaffer
Commit: a39cdf0a1b10b0731c527a319e7fdc15414c41fe
https://github.com/GafferHQ/gaffer/commit/a39cdf0a1b10b0731c527a319e7fdc15414c41fe
Author: John Haddon <thehad...@gmail.com>
Date: 2024-12-10 (Tue, 10 Dec 2024)
Changed paths:
M Changes.md
M python/GafferSceneTest/ParentTest.py
A python/GafferSceneTest/scripts/promotedArrayPlug-1.5.1.0.gfr
M python/GafferTest/ArrayPlugTest.py
A python/GafferTest/scripts/arrayPlugWithOutputPrototype-1.5.1.0.gfr
A startup/Gaffer/arrayPlugCompatibility.py
Log Message:
-----------
ArrayPlug : Fix loading of dynamic ArrayPlugs saved in Gaffer 1.5+
We changed the name of the `element` argument, and need to account for that in a compatibility shim. A further complication is that in 1.5 the ArrayPlug doesn't care what direction the prototype has, because it is just used as a factory via `createCounterpart()` which re-specifies the direction. But in 1.4 it is used as the first element of the array as well, so we need to adjust direction if necessary.
Commit: 1d8403c912e060f0a31a94ee676ed2e9335ea9e2
Commit: a39cdf0a1b10b0731c527a319e7fdc15414c41fe
https://github.com/GafferHQ/gaffer/commit/a39cdf0a1b10b0731c527a319e7fdc15414c41fe
Author: John Haddon <thehad...@gmail.com>
Date: 2024-12-10 (Tue, 10 Dec 2024)
Changed paths:
M Changes.md
M python/GafferSceneTest/ParentTest.py
A python/GafferSceneTest/scripts/promotedArrayPlug-1.5.1.0.gfr
M python/GafferTest/ArrayPlugTest.py
A python/GafferTest/scripts/arrayPlugWithOutputPrototype-1.5.1.0.gfr
A startup/Gaffer/arrayPlugCompatibility.py
Log Message:
-----------
ArrayPlug : Fix loading of dynamic ArrayPlugs saved in Gaffer 1.5+
We changed the name of the `element` argument, and need to account for that in a compatibility shim. A further complication is that in 1.5 the ArrayPlug doesn't care what direction the prototype has, because it is just used as a factory via `createCounterpart()` which re-specifies the direction. But in 1.4 it is used as the first element of the array as well, so we need to adjust direction if necessary.
https://github.com/GafferHQ/gaffer/commit/1d8403c912e060f0a31a94ee676ed2e9335ea9e2
Author: John Haddon <thehad...@gmail.com>
Date: 2024-12-10 (Tue, 10 Dec 2024)
Changed paths:
M Changes.md
M python/GafferUI/RandomChoiceUI.py
Date: 2024-12-10 (Tue, 10 Dec 2024)
Changed paths:
M Changes.md
Log Message:
-----------
RandomChoiceUI : Fix handling of non-ValuePlugs
Right-clicking on (for example) a `ShaderAssignment.shader` plug in the NodeEditor was leading to the following warning :
```
ERROR : Plug menu : Traceback (most recent call last):
ERROR : File "/home/john/dev/build/gaffer-1.4/python/GafferUI/PlugValueWidget.py", line 994, in __combiner
ERROR : next( results )
ERROR : IECore.Exception: Traceback (most recent call last):
ERROR : File "/home/john/dev/build/gaffer-1.4/python/GafferUI/RandomChoiceUI.py", line 245, in __popupMenu
ERROR : if not Gaffer.RandomChoice.canSetup( plug ) :
ERROR : Boost.Python.ArgumentError: Python argument types in
ERROR : RandomChoice.canSetup(ShaderPlug)
ERROR : did not match C++ signature:
ERROR : canSetup(Gaffer::ValuePlug const*)
```
Commit: fe384e413de3fc3ae26d2dec785d6b85d8c75a7e
https://github.com/GafferHQ/gaffer/commit/fe384e413de3fc3ae26d2dec785d6b85d8c75a7e
Author: Murray Stevenson <50844517+mur...@users.noreply.github.com>
Date: 2024-12-10 (Tue, 10 Dec 2024)
Changed paths:
M Changes.md
M python/GafferSceneTest/ParentTest.py
A python/GafferSceneTest/scripts/promotedArrayPlug-1.5.1.0.gfr
M python/GafferTest/ArrayPlugTest.py
A python/GafferTest/scripts/arrayPlugWithOutputPrototype-1.5.1.0.gfr
A startup/Gaffer/arrayPlugCompatibility.py
Log Message:
-----------
Merge pull request #6179 from johnhaddon/arrayPlugCompat
ArrayPlug : Fix loading of dynamic ArrayPlugs saved in Gaffer 1.5+
https://github.com/GafferHQ/gaffer/commit/2e0c9ca5eefc9ad9702a2452f88790a6bf8536cb
Author: Eric Mehl <er...@cinesite.com>
Date: 2024-12-10 (Tue, 10 Dec 2024)
Changed paths:
M Changes.md
M python/GafferUI/RandomChoiceUI.py
Changed paths:
M Changes.md
Log Message:
-----------
Merge pull request #6180 from johnhaddon/randomChoiceUIFix
RandomChoiceUI : Fix handling of non-ValuePlugs
Commit: 97c574bc3ea746c951481ef72233fda9db4b99a2
https://github.com/GafferHQ/gaffer/commit/97c574bc3ea746c951481ef72233fda9db4b99a2
Author: John Haddon <thehad...@gmail.com>
Date: 2024-12-13 (Fri, 13 Dec 2024)
Changed paths:
M Changes.md
M SConstruct
Log Message:
-----------
Bump version to 1.4.15.3
Commit: 1c65f6315b50b07dbb16605963e8624edb0885d7
https://github.com/GafferHQ/gaffer/commit/1c65f6315b50b07dbb16605963e8624edb0885d7
Author: John Haddon <thehad...@gmail.com>
Date: 2024-12-13 (Fri, 13 Dec 2024)
Changed paths:
M Changes.md
M python/GafferSceneTest/ParentTest.py
A python/GafferSceneTest/scripts/promotedArrayPlug-1.5.1.0.gfr
M python/GafferTest/ArrayPlugTest.py
A python/GafferTest/scripts/arrayPlugWithOutputPrototype-1.5.1.0.gfr
Log Message:
-----------
Merge branch '1.4_maintenance' into 1.5_maintenance
Compare: https://github.com/GafferHQ/gaffer/compare/1dc7d84750fe...1c65f6315b50
John Haddon
Dec 13, 2024, 4:33:29 AM12/13/24
to gaffer-...@googlegroups.com
Branch: refs/heads/main
Commit: e8394091c6f836dabe0c935bdf9978258a75dfe6
https://github.com/GafferHQ/gaffer/commit/e8394091c6f836dabe0c935bdf9978258a75dfe6
Author: John Haddon <thehad...@gmail.com>
Date: 2024-12-12 (Thu, 12 Dec 2024)
Changed paths:
M Changes.md
M python/GafferUI/EditScopeUI.py
Log Message:
-----------
EditScopeUI : Fix bug handling read-only ScriptNodes
In this case `relativeName()` was throwing due to the ScriptNode not being a child of itself. I wasn't really sure what name to use here - the node name itself isn't really meaningful, and `ScriptNode` might not mean much to a user. In practice ScriptNodes are only read-only when the file on the filesystem is read-only, so I went with "File" as hopefully being the most self-explanatory.
Commit: 1dc7d84750fe46bac0bc2b6ece1eef2e3eb97b2e
https://github.com/GafferHQ/gaffer/commit/1dc7d84750fe46bac0bc2b6ece1eef2e3eb97b2e
Author: Murray Stevenson <50844517+mur...@users.noreply.github.com>
Date: 2024-12-12 (Thu, 12 Dec 2024)
Changed paths:
M Changes.md
M python/GafferUI/EditScopeUI.py
Log Message:
-----------
Merge pull request #6185 from johnhaddon/globalEditTargetFix
EditScopeUI : Fix bug handling read-only ScriptNodes
Commit: 97c574bc3ea746c951481ef72233fda9db4b99a2
https://github.com/GafferHQ/gaffer/commit/97c574bc3ea746c951481ef72233fda9db4b99a2
Author: John Haddon <thehad...@gmail.com>
Date: 2024-12-13 (Fri, 13 Dec 2024)
Changed paths:
M Changes.md
M SConstruct
Log Message:
-----------
Bump version to 1.4.15.3
Commit: 1c65f6315b50b07dbb16605963e8624edb0885d7
https://github.com/GafferHQ/gaffer/commit/1c65f6315b50b07dbb16605963e8624edb0885d7
Author: John Haddon <thehad...@gmail.com>
Date: 2024-12-13 (Fri, 13 Dec 2024)
Changed paths:
M Changes.md
M python/GafferSceneTest/ParentTest.py
A python/GafferSceneTest/scripts/promotedArrayPlug-1.5.1.0.gfr
M python/GafferTest/ArrayPlugTest.py
A python/GafferTest/scripts/arrayPlugWithOutputPrototype-1.5.1.0.gfr
M python/GafferUI/RandomChoiceUI.py
Log Message:
-----------
Merge branch '1.4_maintenance' into 1.5_maintenance
Commit: 6c28f286c9265e6909ef0b2486a5fe2d828f856a
https://github.com/GafferHQ/gaffer/commit/6c28f286c9265e6909ef0b2486a5fe2d828f856a
Commit: feb37d0d4d5f6fa6f6e778175a9c0474500471ef
https://github.com/GafferHQ/gaffer/commit/feb37d0d4d5f6fa6f6e778175a9c0474500471ef
-----------
Changes.md : Add missing entry
This fix was merged in from 1.4_maintenance recently.
Commit: a81b17ff66710380e7a396206560110252a65a40
https://github.com/GafferHQ/gaffer/commit/a81b17ff66710380e7a396206560110252a65a40
Compare: https://github.com/GafferHQ/gaffer/compare/529dc33fe0af...a81b17ff6671
https://github.com/GafferHQ/gaffer/commit/e8394091c6f836dabe0c935bdf9978258a75dfe6
Author: John Haddon <thehad...@gmail.com>
Date: 2024-12-12 (Thu, 12 Dec 2024)
Changed paths:
M Changes.md
M python/GafferUI/EditScopeUI.py
Log Message:
-----------
EditScopeUI : Fix bug handling read-only ScriptNodes
In this case `relativeName()` was throwing due to the ScriptNode not being a child of itself. I wasn't really sure what name to use here - the node name itself isn't really meaningful, and `ScriptNode` might not mean much to a user. In practice ScriptNodes are only read-only when the file on the filesystem is read-only, so I went with "File" as hopefully being the most self-explanatory.
Commit: 1dc7d84750fe46bac0bc2b6ece1eef2e3eb97b2e
https://github.com/GafferHQ/gaffer/commit/1dc7d84750fe46bac0bc2b6ece1eef2e3eb97b2e
Author: Murray Stevenson <50844517+mur...@users.noreply.github.com>
Date: 2024-12-12 (Thu, 12 Dec 2024)
Changed paths:
M Changes.md
M python/GafferUI/EditScopeUI.py
Log Message:
-----------
Merge pull request #6185 from johnhaddon/globalEditTargetFix
EditScopeUI : Fix bug handling read-only ScriptNodes
Commit: 97c574bc3ea746c951481ef72233fda9db4b99a2
https://github.com/GafferHQ/gaffer/commit/97c574bc3ea746c951481ef72233fda9db4b99a2
Author: John Haddon <thehad...@gmail.com>
Date: 2024-12-13 (Fri, 13 Dec 2024)
Changed paths:
M Changes.md
M SConstruct
Log Message:
-----------
Bump version to 1.4.15.3
Commit: 1c65f6315b50b07dbb16605963e8624edb0885d7
https://github.com/GafferHQ/gaffer/commit/1c65f6315b50b07dbb16605963e8624edb0885d7
Author: John Haddon <thehad...@gmail.com>
Date: 2024-12-13 (Fri, 13 Dec 2024)
Changed paths:
M Changes.md
M python/GafferSceneTest/ParentTest.py
A python/GafferSceneTest/scripts/promotedArrayPlug-1.5.1.0.gfr
M python/GafferTest/ArrayPlugTest.py
A python/GafferTest/scripts/arrayPlugWithOutputPrototype-1.5.1.0.gfr
M python/GafferUI/RandomChoiceUI.py
Log Message:
-----------
Merge branch '1.4_maintenance' into 1.5_maintenance
https://github.com/GafferHQ/gaffer/commit/6c28f286c9265e6909ef0b2486a5fe2d828f856a
Author: John Haddon <thehad...@gmail.com>
Date: 2024-12-13 (Fri, 13 Dec 2024)
Changed paths:
M Changes.md
M SConstruct
Log Message:
-----------
Bump version to 1.5.2.0
Date: 2024-12-13 (Fri, 13 Dec 2024)
Changed paths:
M Changes.md
M SConstruct
Log Message:
-----------
Commit: feb37d0d4d5f6fa6f6e778175a9c0474500471ef
https://github.com/GafferHQ/gaffer/commit/feb37d0d4d5f6fa6f6e778175a9c0474500471ef
Author: John Haddon <thehad...@gmail.com>
Date: 2024-12-13 (Fri, 13 Dec 2024)
Changed paths:
M Changes.md
Log Message:
Date: 2024-12-13 (Fri, 13 Dec 2024)
Changed paths:
M Changes.md
-----------
Changes.md : Add missing entry
This fix was merged in from 1.4_maintenance recently.
Commit: a81b17ff66710380e7a396206560110252a65a40
https://github.com/GafferHQ/gaffer/commit/a81b17ff66710380e7a396206560110252a65a40
Author: John Haddon <thehad...@gmail.com>
Date: 2024-12-13 (Fri, 13 Dec 2024)
Changed paths:
M Changes.md
M python/GafferSceneTest/ParentTest.py
A python/GafferSceneTest/scripts/promotedArrayPlug-1.5.1.0.gfr
M python/GafferTest/ArrayPlugTest.py
A python/GafferTest/scripts/arrayPlugWithOutputPrototype-1.5.1.0.gfr
M python/GafferUI/EditScopeUI.py
Date: 2024-12-13 (Fri, 13 Dec 2024)
Changed paths:
M Changes.md
M python/GafferSceneTest/ParentTest.py
A python/GafferSceneTest/scripts/promotedArrayPlug-1.5.1.0.gfr
M python/GafferTest/ArrayPlugTest.py
A python/GafferTest/scripts/arrayPlugWithOutputPrototype-1.5.1.0.gfr
M python/GafferUI/RandomChoiceUI.py
Log Message:
-----------
Merge branch '1.5_maintenance'
Log Message:
-----------
Compare: https://github.com/GafferHQ/gaffer/compare/529dc33fe0af...a81b17ff6671
Reply all
Reply to author
Forward
0 new messages