[GafferHQ/gaffer] 863be3: PathFilter : Prevent path drops on read only nodes
0 views
Skip to first unread message
John Haddon
Dec 10, 2024, 5:15:53 AM12/10/24
to gaffer-...@googlegroups.com
Branch: refs/heads/1.5_maintenance
Home: https://github.com/GafferHQ/gaffer
Commit: 863be3dd4cdf33bcd1a784066ead186a9bea3b38
https://github.com/GafferHQ/gaffer/commit/863be3dd4cdf33bcd1a784066ead186a9bea3b38
Author: Eric Mehl <er...@thinkhypothetical.com>
Date: 2024-11-18 (Mon, 18 Nov 2024)
Changed paths:
M Changes.md
M python/GafferSceneUI/PathFilterUI.py
M python/GafferUI/VectorDataWidget.py
Log Message:
-----------
PathFilter : Prevent path drops on read only nodes
Commit: 42f7ab3f3bdee74692254eaf7ceee99e7fdadcbf
https://github.com/GafferHQ/gaffer/commit/42f7ab3f3bdee74692254eaf7ceee99e7fdadcbf
Author: Eric Mehl <er...@thinkhypothetical.com>
Date: 2024-11-18 (Mon, 18 Nov 2024)
Changed paths:
M python/GafferSceneUI/PathFilterUI.py
M python/GafferSceneUI/SetFilterUI.py
Log Message:
-----------
Path / SetFilterUI : Add `notEditable` pointers
Commit: 535a1b8d8476c3409abf93c6eb9a27034d9965da
https://github.com/GafferHQ/gaffer/commit/535a1b8d8476c3409abf93c6eb9a27034d9965da
Author: Murray Stevenson <50844517+mur...@users.noreply.github.com>
Date: 2024-11-19 (Tue, 19 Nov 2024)
Changed paths:
M Changes.md
M python/GafferSceneUI/PathFilterUI.py
M python/GafferSceneUI/SetFilterUI.py
M python/GafferUI/VectorDataWidget.py
Log Message:
-----------
Merge pull request #6137 from ericmehl/dropReadOnlyPathFilterFix
PathFilter : Fix dropping paths onto read-only nodes
Commit: c1be2dabb6c85b6ea093e4744e1e9a4eb6667bc0
https://github.com/GafferHQ/gaffer/commit/c1be2dabb6c85b6ea093e4744e1e9a4eb6667bc0
Author: Murray Stevenson <50844517+mur...@users.noreply.github.com>
Date: 2024-11-20 (Wed, 20 Nov 2024)
Changed paths:
M .github/workflows/main.yml
Log Message:
-----------
CI : Drop GCC9 builds
Commit: 7ddf9b1cef4479027993847ca1f29bfeae235db8
https://github.com/GafferHQ/gaffer/commit/7ddf9b1cef4479027993847ca1f29bfeae235db8
Author: Murray Stevenson <50844517+mur...@users.noreply.github.com>
Date: 2024-11-20 (Wed, 20 Nov 2024)
Changed paths:
M .github/workflows/main.yml
Log Message:
-----------
CI : Update to node20 actions
Commit: b334e695cdc8e7328fdfcd5def51229a30bf7f52
https://github.com/GafferHQ/gaffer/commit/b334e695cdc8e7328fdfcd5def51229a30bf7f52
Author: John Haddon <thehad...@gmail.com>
Date: 2024-11-20 (Wed, 20 Nov 2024)
Changed paths:
M .github/workflows/main.yml
Log Message:
-----------
Merge pull request #6152 from murraystevenson/farewellGCC9
CI : Drop GCC9 builds for `1.4_maintenance`
Commit: 4a8b9fed9548a79fea1b8623803bd64a2f8f33da
https://github.com/GafferHQ/gaffer/commit/4a8b9fed9548a79fea1b8623803bd64a2f8f33da
Author: John Haddon <thehad...@gmail.com>
Date: 2024-11-22 (Fri, 22 Nov 2024)
Changed paths:
M Changes.md
M SConstruct
Log Message:
-----------
Bump version to 1.4.15.2
Commit: a69879153e0c39230988a28c8bda52f77474f635
https://github.com/GafferHQ/gaffer/commit/a69879153e0c39230988a28c8bda52f77474f635
Author: John Haddon <thehad...@gmail.com>
Date: 2024-11-27 (Wed, 27 Nov 2024)
Changed paths:
M Changes.md
M startup/gui/graphEditor.py
Log Message:
-----------
GraphEditor config : Fix error in location drop handler
When the drag originates outside Gaffer, `event.sourceWidget` is `None`, in which case we were getting the following error :
```
ERROR : File "/home/john/dev/build/gaffer-1.4/startup/gui/graphEditor.py", line 253, in __dropLocationData
ERROR : sourceEditor = event.sourceWidget.ancestor( GafferUI.Editor )
ERROR : AttributeError: 'NoneType' object has no attribute 'ancestor'
```
This had gone unnoticed before, because typically such events were being accepted by `__fileDragEnter()` first and never reached the location drop handler. But when the file is of an unhandled type, the file handler returns False and the location handler comes into play.
Commit: 5d19325c222087a2135136cb883d31e3b81ce405
https://github.com/GafferHQ/gaffer/commit/5d19325c222087a2135136cb883d31e3b81ce405
Author: John Haddon <thehad...@gmail.com>
Date: 2024-11-27 (Wed, 27 Nov 2024)
Changed paths:
M Changes.md
M python/GafferUI/Widget.py
Log Message:
-----------
Widget : Set `DragDropEvent.sourceWidget` from foreign drags
Our assumption was that such drags would always comes from outside of Gaffer - the foreign drag handling was originally added so that we could drag files from the system browser into the GraphEditor. In that case there is no source of information for `sourceWidget`.
But some folks prefer to code their Gaffer extensions in pure Qt, with a tiny shim to host them in GafferUI. In this case, we _can_ find a suitable `sourceWidget`, which we now do.
Commit: f45b0f11d91355e648ce67eef353f7bbebcd98a4
https://github.com/GafferHQ/gaffer/commit/f45b0f11d91355e648ce67eef353f7bbebcd98a4
Author: Murray Stevenson <50844517+mur...@users.noreply.github.com>
Date: 2024-11-29 (Fri, 29 Nov 2024)
Changed paths:
M Changes.md
M python/GafferUI/Widget.py
M startup/gui/graphEditor.py
Log Message:
-----------
Merge pull request #6163 from johnhaddon/dragDropFixes
Small drag & drop fixes
Commit: 300dda0b3ded7d82a9e31f47a3fd0280e8d3ace2
https://github.com/GafferHQ/gaffer/commit/300dda0b3ded7d82a9e31f47a3fd0280e8d3ace2
Author: John Haddon <thehad...@gmail.com>
Date: 2024-12-09 (Mon, 09 Dec 2024)
Changed paths:
M Changes.md
M python/GafferImageUI/CatalogueUI.py
Log Message:
-----------
CatalogueUI : Don't "steal" irrelevant drags
We were accepting any drag which provided StringVectorData, when we should only have been accepting those which originated in the image listing (because we are using the drag to reorder images). This meant we were accepting drags of paths from the HierarchyView, and then clobbering the custom pointer in `__pathListingDragLeave`. This gave people the impression that the drag was broken, when in fact you could still continue and drop elsewhere (despite the pointer indicating otherwise).
Also tweaked the drag move logic so we use exactly the same checks in both enter and move.
Commit: dc38e12468bd1e3ecfe3e73468cf1a54bf8f5948
https://github.com/GafferHQ/gaffer/commit/dc38e12468bd1e3ecfe3e73468cf1a54bf8f5948
Author: John Haddon <thehad...@gmail.com>
Date: 2024-12-09 (Mon, 09 Dec 2024)
Changed paths:
M Changes.md
M python/GafferImageUI/CatalogueUI.py
Log Message:
-----------
Merge pull request #6168 from johnhaddon/catalogueDragFix
CatalogueUI : Don't "steal" irrelevant drags
Commit: 6d0ae46543bcbbe833b110d76a0702ab1528759b
https://github.com/GafferHQ/gaffer/commit/6d0ae46543bcbbe833b110d76a0702ab1528759b
Author: John Haddon <thehad...@gmail.com>
Date: 2024-12-10 (Tue, 10 Dec 2024)
Changed paths:
M Changes.md
M python/GafferUI/GadgetWidget.py
M python/GafferUITest/GadgetWidgetTest.py
Log Message:
-----------
GadgetWidget : Fix signal handling bug
This was broken in 9e052380bc2c272067827d6d0144b00cb3d41fbb, which switched from using a scoped to an unscoped connection. We need a scoped connection so that we automatically remove the connection to the previous viewport when making the connection to the new one.
Commit: f3b789892b3a208f1cb8ca38b46c006e631ee336
https://github.com/GafferHQ/gaffer/commit/f3b789892b3a208f1cb8ca38b46c006e631ee336
Author: John Haddon <thehad...@gmail.com>
Date: 2024-12-10 (Tue, 10 Dec 2024)
Changed paths:
M Changes.md
M python/GafferUI/GadgetWidget.py
M python/GafferUITest/GadgetWidgetTest.py
Log Message:
-----------
Merge pull request #6169 from johnhaddon/gadgetWidgetFix
GadgetWidget : Fix signal handling bug
Commit: bf8d4045f840bb4f0028efe9ccc5ab4c8bf1e9f3
https://github.com/GafferHQ/gaffer/commit/bf8d4045f840bb4f0028efe9ccc5ab4c8bf1e9f3
Author: John Haddon <thehad...@gmail.com>
Date: 2024-12-10 (Tue, 10 Dec 2024)
Changed paths:
M Changes.md
M python/GafferImageUI/CatalogueUI.py
M python/GafferSceneUI/PathFilterUI.py
M python/GafferSceneUI/SetFilterUI.py
M python/GafferUI/GadgetWidget.py
M python/GafferUI/VectorDataWidget.py
M python/GafferUI/Widget.py
M python/GafferUITest/GadgetWidgetTest.py
M startup/gui/graphEditor.py
Log Message:
-----------
Merge branch '1.4_maintenance' into 1.5_maintenance
Compare: https://github.com/GafferHQ/gaffer/compare/092681ff0bd6...bf8d4045f840
To unsubscribe from these emails, change your notification settings at https://github.com/GafferHQ/gaffer/settings/notifications
Home: https://github.com/GafferHQ/gaffer
Commit: 863be3dd4cdf33bcd1a784066ead186a9bea3b38
https://github.com/GafferHQ/gaffer/commit/863be3dd4cdf33bcd1a784066ead186a9bea3b38
Author: Eric Mehl <er...@thinkhypothetical.com>
Date: 2024-11-18 (Mon, 18 Nov 2024)
Changed paths:
M Changes.md
M python/GafferSceneUI/PathFilterUI.py
M python/GafferUI/VectorDataWidget.py
Log Message:
-----------
PathFilter : Prevent path drops on read only nodes
Commit: 42f7ab3f3bdee74692254eaf7ceee99e7fdadcbf
https://github.com/GafferHQ/gaffer/commit/42f7ab3f3bdee74692254eaf7ceee99e7fdadcbf
Author: Eric Mehl <er...@thinkhypothetical.com>
Date: 2024-11-18 (Mon, 18 Nov 2024)
Changed paths:
M python/GafferSceneUI/PathFilterUI.py
M python/GafferSceneUI/SetFilterUI.py
Log Message:
-----------
Path / SetFilterUI : Add `notEditable` pointers
Commit: 535a1b8d8476c3409abf93c6eb9a27034d9965da
https://github.com/GafferHQ/gaffer/commit/535a1b8d8476c3409abf93c6eb9a27034d9965da
Author: Murray Stevenson <50844517+mur...@users.noreply.github.com>
Date: 2024-11-19 (Tue, 19 Nov 2024)
Changed paths:
M Changes.md
M python/GafferSceneUI/PathFilterUI.py
M python/GafferSceneUI/SetFilterUI.py
M python/GafferUI/VectorDataWidget.py
Log Message:
-----------
Merge pull request #6137 from ericmehl/dropReadOnlyPathFilterFix
PathFilter : Fix dropping paths onto read-only nodes
Commit: c1be2dabb6c85b6ea093e4744e1e9a4eb6667bc0
https://github.com/GafferHQ/gaffer/commit/c1be2dabb6c85b6ea093e4744e1e9a4eb6667bc0
Author: Murray Stevenson <50844517+mur...@users.noreply.github.com>
Date: 2024-11-20 (Wed, 20 Nov 2024)
Changed paths:
M .github/workflows/main.yml
Log Message:
-----------
CI : Drop GCC9 builds
Commit: 7ddf9b1cef4479027993847ca1f29bfeae235db8
https://github.com/GafferHQ/gaffer/commit/7ddf9b1cef4479027993847ca1f29bfeae235db8
Author: Murray Stevenson <50844517+mur...@users.noreply.github.com>
Date: 2024-11-20 (Wed, 20 Nov 2024)
Changed paths:
M .github/workflows/main.yml
Log Message:
-----------
CI : Update to node20 actions
Commit: b334e695cdc8e7328fdfcd5def51229a30bf7f52
https://github.com/GafferHQ/gaffer/commit/b334e695cdc8e7328fdfcd5def51229a30bf7f52
Author: John Haddon <thehad...@gmail.com>
Date: 2024-11-20 (Wed, 20 Nov 2024)
Changed paths:
M .github/workflows/main.yml
Log Message:
-----------
Merge pull request #6152 from murraystevenson/farewellGCC9
CI : Drop GCC9 builds for `1.4_maintenance`
Commit: 4a8b9fed9548a79fea1b8623803bd64a2f8f33da
https://github.com/GafferHQ/gaffer/commit/4a8b9fed9548a79fea1b8623803bd64a2f8f33da
Author: John Haddon <thehad...@gmail.com>
Date: 2024-11-22 (Fri, 22 Nov 2024)
Changed paths:
M Changes.md
M SConstruct
Log Message:
-----------
Bump version to 1.4.15.2
Commit: a69879153e0c39230988a28c8bda52f77474f635
https://github.com/GafferHQ/gaffer/commit/a69879153e0c39230988a28c8bda52f77474f635
Author: John Haddon <thehad...@gmail.com>
Date: 2024-11-27 (Wed, 27 Nov 2024)
Changed paths:
M Changes.md
M startup/gui/graphEditor.py
Log Message:
-----------
GraphEditor config : Fix error in location drop handler
When the drag originates outside Gaffer, `event.sourceWidget` is `None`, in which case we were getting the following error :
```
ERROR : File "/home/john/dev/build/gaffer-1.4/startup/gui/graphEditor.py", line 253, in __dropLocationData
ERROR : sourceEditor = event.sourceWidget.ancestor( GafferUI.Editor )
ERROR : AttributeError: 'NoneType' object has no attribute 'ancestor'
```
This had gone unnoticed before, because typically such events were being accepted by `__fileDragEnter()` first and never reached the location drop handler. But when the file is of an unhandled type, the file handler returns False and the location handler comes into play.
Commit: 5d19325c222087a2135136cb883d31e3b81ce405
https://github.com/GafferHQ/gaffer/commit/5d19325c222087a2135136cb883d31e3b81ce405
Author: John Haddon <thehad...@gmail.com>
Date: 2024-11-27 (Wed, 27 Nov 2024)
Changed paths:
M Changes.md
M python/GafferUI/Widget.py
Log Message:
-----------
Widget : Set `DragDropEvent.sourceWidget` from foreign drags
Our assumption was that such drags would always comes from outside of Gaffer - the foreign drag handling was originally added so that we could drag files from the system browser into the GraphEditor. In that case there is no source of information for `sourceWidget`.
But some folks prefer to code their Gaffer extensions in pure Qt, with a tiny shim to host them in GafferUI. In this case, we _can_ find a suitable `sourceWidget`, which we now do.
Commit: f45b0f11d91355e648ce67eef353f7bbebcd98a4
https://github.com/GafferHQ/gaffer/commit/f45b0f11d91355e648ce67eef353f7bbebcd98a4
Author: Murray Stevenson <50844517+mur...@users.noreply.github.com>
Date: 2024-11-29 (Fri, 29 Nov 2024)
Changed paths:
M Changes.md
M python/GafferUI/Widget.py
M startup/gui/graphEditor.py
Log Message:
-----------
Merge pull request #6163 from johnhaddon/dragDropFixes
Small drag & drop fixes
Commit: 300dda0b3ded7d82a9e31f47a3fd0280e8d3ace2
https://github.com/GafferHQ/gaffer/commit/300dda0b3ded7d82a9e31f47a3fd0280e8d3ace2
Author: John Haddon <thehad...@gmail.com>
Date: 2024-12-09 (Mon, 09 Dec 2024)
Changed paths:
M Changes.md
M python/GafferImageUI/CatalogueUI.py
Log Message:
-----------
CatalogueUI : Don't "steal" irrelevant drags
We were accepting any drag which provided StringVectorData, when we should only have been accepting those which originated in the image listing (because we are using the drag to reorder images). This meant we were accepting drags of paths from the HierarchyView, and then clobbering the custom pointer in `__pathListingDragLeave`. This gave people the impression that the drag was broken, when in fact you could still continue and drop elsewhere (despite the pointer indicating otherwise).
Also tweaked the drag move logic so we use exactly the same checks in both enter and move.
Commit: dc38e12468bd1e3ecfe3e73468cf1a54bf8f5948
https://github.com/GafferHQ/gaffer/commit/dc38e12468bd1e3ecfe3e73468cf1a54bf8f5948
Author: John Haddon <thehad...@gmail.com>
Date: 2024-12-09 (Mon, 09 Dec 2024)
Changed paths:
M Changes.md
M python/GafferImageUI/CatalogueUI.py
Log Message:
-----------
Merge pull request #6168 from johnhaddon/catalogueDragFix
CatalogueUI : Don't "steal" irrelevant drags
Commit: 6d0ae46543bcbbe833b110d76a0702ab1528759b
https://github.com/GafferHQ/gaffer/commit/6d0ae46543bcbbe833b110d76a0702ab1528759b
Author: John Haddon <thehad...@gmail.com>
Date: 2024-12-10 (Tue, 10 Dec 2024)
Changed paths:
M Changes.md
M python/GafferUI/GadgetWidget.py
M python/GafferUITest/GadgetWidgetTest.py
Log Message:
-----------
GadgetWidget : Fix signal handling bug
This was broken in 9e052380bc2c272067827d6d0144b00cb3d41fbb, which switched from using a scoped to an unscoped connection. We need a scoped connection so that we automatically remove the connection to the previous viewport when making the connection to the new one.
Commit: f3b789892b3a208f1cb8ca38b46c006e631ee336
https://github.com/GafferHQ/gaffer/commit/f3b789892b3a208f1cb8ca38b46c006e631ee336
Author: John Haddon <thehad...@gmail.com>
Date: 2024-12-10 (Tue, 10 Dec 2024)
Changed paths:
M Changes.md
M python/GafferUI/GadgetWidget.py
M python/GafferUITest/GadgetWidgetTest.py
Log Message:
-----------
Merge pull request #6169 from johnhaddon/gadgetWidgetFix
GadgetWidget : Fix signal handling bug
Commit: bf8d4045f840bb4f0028efe9ccc5ab4c8bf1e9f3
https://github.com/GafferHQ/gaffer/commit/bf8d4045f840bb4f0028efe9ccc5ab4c8bf1e9f3
Author: John Haddon <thehad...@gmail.com>
Date: 2024-12-10 (Tue, 10 Dec 2024)
Changed paths:
M Changes.md
M python/GafferImageUI/CatalogueUI.py
M python/GafferSceneUI/PathFilterUI.py
M python/GafferSceneUI/SetFilterUI.py
M python/GafferUI/GadgetWidget.py
M python/GafferUI/VectorDataWidget.py
M python/GafferUI/Widget.py
M python/GafferUITest/GadgetWidgetTest.py
M startup/gui/graphEditor.py
Log Message:
-----------
Merge branch '1.4_maintenance' into 1.5_maintenance
Compare: https://github.com/GafferHQ/gaffer/compare/092681ff0bd6...bf8d4045f840
To unsubscribe from these emails, change your notification settings at https://github.com/GafferHQ/gaffer/settings/notifications
John Haddon
Dec 10, 2024, 5:16:29 AM12/10/24
to gaffer-...@googlegroups.com
Branch: refs/heads/main
Commit: 74d9bfc592ecbf6a3194e8327859c51b728af9b5
https://github.com/GafferHQ/gaffer/commit/74d9bfc592ecbf6a3194e8327859c51b728af9b5
Author: Eric Mehl <er...@thinkhypothetical.com>
M python/GafferUI/ColorSwatchPlugValueWidget.py
Log Message:
-----------
Color*PlugValueWidget : Removed `scoped = False`
Commit: 23228363e83acd230c8bfcb55a308a98c3c68964
https://github.com/GafferHQ/gaffer/commit/23228363e83acd230c8bfcb55a308a98c3c68964
Author: John Haddon <thehad...@gmail.com>
Date: 2024-11-25 (Mon, 25 Nov 2024)
Changed paths:
M python/GafferUI/ColorChooserPlugValueWidget.py
M python/GafferUI/ColorSwatchPlugValueWidget.py
Log Message:
-----------
Merge pull request #6160 from ericmehl/cleanScopedSignals
Color*PlugValueWidget : Removed `scoped = False`
Commit: 724d1828f570183c3c0a860e1d364f1389ee2a09
https://github.com/GafferHQ/gaffer/commit/724d1828f570183c3c0a860e1d364f1389ee2a09
Author: John Haddon <thehad...@gmail.com>
Date: 2024-11-26 (Tue, 26 Nov 2024)
Changed paths:
M Changes.md
M python/GafferUI/PlugLayout.py
Log Message:
-----------
PlugLayout : Update activations when children added/removed
Commit: 597afa5f0778af6cbf72def1cf725d8735c50835
https://github.com/GafferHQ/gaffer/commit/597afa5f0778af6cbf72def1cf725d8735c50835
Author: John Haddon <thehad...@gmail.com>
Date: 2024-11-26 (Tue, 26 Nov 2024)
Changed paths:
M SConstruct
M bin/gaffer
M bin/gaffer.cmd
A include/GafferML/Export.h
A include/GafferML/TypeIds.h
A python/GafferML/__init__.py
A python/GafferMLTest/__init__.py
A python/GafferMLUI/__init__.py
A python/GafferMLUITest/DocumentationTest.py
A python/GafferMLUITest/NodeUITest.py
A python/GafferMLUITest/__init__.py
A src/GafferMLModule/GafferMLModule.cpp
Log Message:
-----------
GafferML : Add library and module boilerplate
Commit: 24ec3f10fecf850cb397dd40f232548f893ab7ba
https://github.com/GafferHQ/gaffer/commit/24ec3f10fecf850cb397dd40f232548f893ab7ba
Author: John Haddon <thehad...@gmail.com>
Date: 2024-11-26 (Tue, 26 Nov 2024)
Changed paths:
M config/jh/options
Log Message:
-----------
JH config : Build GafferML
Commit: 0e5eb746dffe6d8aa1481d33696676eaed84bd44
https://github.com/GafferHQ/gaffer/commit/0e5eb746dffe6d8aa1481d33696676eaed84bd44
Author: John Haddon <thehad...@gmail.com>
Date: 2024-11-26 (Tue, 26 Nov 2024)
Changed paths:
A include/GafferML/Tensor.h
A python/GafferMLTest/TensorTest.py
M python/GafferMLTest/__init__.py
A src/GafferML/Tensor.cpp
M src/GafferMLModule/GafferMLModule.cpp
Log Message:
-----------
GafferML : Add Tensor class
This is a wrapper class that will allow us to pass ONNX values through Gaffer's computation graph.
Commit: 7728139de8263728fb2c6c6dbc19ba6a89a624d6
https://github.com/GafferHQ/gaffer/commit/7728139de8263728fb2c6c6dbc19ba6a89a624d6
Author: John Haddon <thehad...@gmail.com>
Date: 2024-11-26 (Tue, 26 Nov 2024)
Changed paths:
A include/GafferML/TensorPlug.h
A python/GafferMLTest/TensorPlugTest.py
M python/GafferMLTest/__init__.py
A src/GafferML/TensorPlug.cpp
M src/GafferMLModule/GafferMLModule.cpp
Log Message:
-----------
GafferML : Add TensorPlug
This will be used for passing Tensor values between nodes.
Commit: 5dcee4ce26b5de7962674fce4808139b39f29c6b
https://github.com/GafferHQ/gaffer/commit/5dcee4ce26b5de7962674fce4808139b39f29c6b
Author: John Haddon <thehad...@gmail.com>
Date: 2024-11-26 (Tue, 26 Nov 2024)
Changed paths:
A include/GafferML/DataToTensor.h
A include/GafferML/DataToTensor.inl
A python/GafferMLTest/DataToTensorTest.py
M python/GafferMLTest/__init__.py
A python/GafferMLUI/DataToTensorUI.py
M python/GafferMLUI/__init__.py
A src/GafferML/DataToTensor.cpp
M src/GafferMLModule/GafferMLModule.cpp
Log Message:
-----------
GafferML : Add DataToTensor node
This allows data from elsewhere in Gaffer to be converted for use in GafferML.
Commit: df99cff95b1f4b4bf2e8ccb9e6f2d882897c895b
https://github.com/GafferHQ/gaffer/commit/df99cff95b1f4b4bf2e8ccb9e6f2d882897c895b
Author: John Haddon <thehad...@gmail.com>
Date: 2024-11-26 (Tue, 26 Nov 2024)
Changed paths:
A include/GafferML/Inference.h
A python/GafferMLTest/InferenceTest.py
M python/GafferMLTest/__init__.py
A python/GafferMLTest/models/add.onnx
A python/GafferMLUI/InferenceUI.py
M python/GafferMLUI/__init__.py
A src/GafferML/Inference.cpp
M src/GafferMLModule/GafferMLModule.cpp
Log Message:
-----------
GafferML : Add Inference node
This forms the meat of GafferML, loading ONNX models and performing inference using data from an array of input TensorPlugs.
Commit: 6d95369782e8013882d16fd23f9d82aa86d04394
https://github.com/GafferHQ/gaffer/commit/6d95369782e8013882d16fd23f9d82aa86d04394
Author: John Haddon <thehad...@gmail.com>
Date: 2024-11-26 (Tue, 26 Nov 2024)
Changed paths:
A include/GafferML/ImageToTensor.h
A python/GafferMLTest/ImageToTensorTest.py
M python/GafferMLTest/__init__.py
A python/GafferMLUI/ImageToTensorUI.py
M python/GafferMLUI/__init__.py
A src/GafferML/ImageToTensor.cpp
M src/GafferMLModule/GafferMLModule.cpp
Log Message:
-----------
GafferML : Add ImageToTensor
This is a node which converts images from GafferImage into tensors for use by the Inference node.
Commit: 5e886b922984cae8aacf90f51e2921eab193c950
https://github.com/GafferHQ/gaffer/commit/5e886b922984cae8aacf90f51e2921eab193c950
Author: John Haddon <thehad...@gmail.com>
Date: 2024-11-26 (Tue, 26 Nov 2024)
Changed paths:
A include/GafferML/TensorToImage.h
A python/GafferMLTest/TensorToImageTest.py
M python/GafferMLTest/__init__.py
A python/GafferMLUI/TensorToImageUI.py
M python/GafferMLUI/__init__.py
A src/GafferML/TensorToImage.cpp
M src/GafferMLModule/GafferMLModule.cpp
Log Message:
-----------
GafferML : Add TensorToImage
This allows tensors to be converted back to GafferImage images, after they have been processed by the Inference node.
Commit: a4cf447b4ae4a92f8837bf63a01d78b7be354991
https://github.com/GafferHQ/gaffer/commit/a4cf447b4ae4a92f8837bf63a01d78b7be354991
Author: John Haddon <thehad...@gmail.com>
Date: 2024-11-26 (Tue, 26 Nov 2024)
Changed paths:
M Changes.md
M startup/gui/menus.py
Log Message:
-----------
GUI startup : Add GafferML nodes to NodeMenu
And advertise them in Changes.md.
Commit: 1e151d04697e8e297da39f8c2c7f8d1553427583
https://github.com/GafferHQ/gaffer/commit/1e151d04697e8e297da39f8c2c7f8d1553427583
Author: John Haddon <thehad...@gmail.com>
Date: 2024-11-26 (Tue, 26 Nov 2024)
Changed paths:
M .github/workflows/main.yml
A .github/workflows/main/installONNX.py
M .github/workflows/main/sconsOptions
Log Message:
-----------
CI : Build and test GafferML
Commit: 674f3a8b1ab5f2eea707baa9e9d589ccda0d4555
https://github.com/GafferHQ/gaffer/commit/674f3a8b1ab5f2eea707baa9e9d589ccda0d4555
Author: John Haddon <thehad...@gmail.com>
Date: 2024-11-26 (Tue, 26 Nov 2024)
Changed paths:
M python/GafferMLTest/TensorToImageTest.py
M src/GafferML/TensorToImage.cpp
Log Message:
-----------
TensorToImage : Check tensor data type
Commit: df8c4980fc4d7fe51e8d9d85abb6b39ff37c653d
https://github.com/GafferHQ/gaffer/commit/df8c4980fc4d7fe51e8d9d85abb6b39ff37c653d
M .github/workflows/main.yml
A .github/workflows/main/installONNX.py
M .github/workflows/main/sconsOptions
M Changes.md
M SConstruct
M bin/gaffer
M bin/gaffer.cmd
M config/jh/options
A include/GafferML/DataToTensor.h
A include/GafferML/DataToTensor.inl
A include/GafferML/Export.h
A include/GafferML/ImageToTensor.h
A include/GafferML/Inference.h
A include/GafferML/Tensor.h
A include/GafferML/TensorPlug.h
A include/GafferML/TensorToImage.h
A include/GafferML/TypeIds.h
A python/GafferML/__init__.py
A python/GafferMLTest/DataToTensorTest.py
A python/GafferMLTest/ImageToTensorTest.py
A python/GafferMLTest/InferenceTest.py
A python/GafferMLTest/TensorPlugTest.py
A python/GafferMLTest/TensorTest.py
A python/GafferMLTest/TensorToImageTest.py
A python/GafferMLTest/__init__.py
A python/GafferMLTest/models/add.onnx
A python/GafferMLUI/DataToTensorUI.py
A python/GafferMLUI/ImageToTensorUI.py
A python/GafferMLUI/InferenceUI.py
A python/GafferMLUI/TensorToImageUI.py
A python/GafferMLUI/__init__.py
A python/GafferMLUITest/DocumentationTest.py
A python/GafferMLUITest/NodeUITest.py
A python/GafferMLUITest/__init__.py
M python/GafferUI/PlugLayout.py
A src/GafferML/DataToTensor.cpp
A src/GafferML/ImageToTensor.cpp
A src/GafferML/Inference.cpp
A src/GafferML/Tensor.cpp
A src/GafferML/TensorPlug.cpp
A src/GafferML/TensorToImage.cpp
A src/GafferMLModule/GafferMLModule.cpp
M startup/gui/menus.py
Log Message:
-----------
Merge pull request #6150 from johnhaddon/onnx
GafferML
Commit: f45b0f11d91355e648ce67eef353f7bbebcd98a4
https://github.com/GafferHQ/gaffer/commit/f45b0f11d91355e648ce67eef353f7bbebcd98a4
Author: Murray Stevenson <50844517+mur...@users.noreply.github.com>
Date: 2024-11-29 (Fri, 29 Nov 2024)
Changed paths:
M Changes.md
M python/GafferUI/Widget.py
M startup/gui/graphEditor.py
Log Message:
-----------
Merge pull request #6163 from johnhaddon/dragDropFixes
Small drag & drop fixes
Commit: ed8273195de13c5aa27196cb03d2b384351d824e
https://github.com/GafferHQ/gaffer/commit/ed8273195de13c5aa27196cb03d2b384351d824e
Author: Eric Mehl <er...@thinkhypothetical.com>
Date: 2024-12-04 (Wed, 04 Dec 2024)
Changed paths:
M src/GafferUI/FPSGadget.cpp
Log Message:
-----------
FPSGadget : Draw on `Front` layer
Commit: f5ca501954f9aacc1cdefc9ce3fc1c03b0354218
https://github.com/GafferHQ/gaffer/commit/f5ca501954f9aacc1cdefc9ce3fc1c03b0354218
Author: John Haddon <thehad...@gmail.com>
Date: 2024-12-05 (Thu, 05 Dec 2024)
Changed paths:
M src/GafferScene/MergeScenes.cpp
Log Message:
-----------
MergeScenes : Reduce code duplication
Commit: dd1e11a09f29f95ed265f0233a00d08d7f595866
https://github.com/GafferHQ/gaffer/commit/dd1e11a09f29f95ed265f0233a00d08d7f595866
Author: John Haddon <thehad...@gmail.com>
Date: 2024-12-05 (Thu, 05 Dec 2024)
Changed paths:
M Changes.md
M src/GafferScene/MergeScenes.cpp
Log Message:
-----------
MergeScenes : Remove unnecessary temporary contexts
We're already in the right context to call `existsPlug()->getValue()` directly. Instead we were calling `exists()` which was constructing a new context identical to the one we already had.
Commit: 673d38488ee86f9a75ff0012ccf08e44ba85cdcb
https://github.com/GafferHQ/gaffer/commit/673d38488ee86f9a75ff0012ccf08e44ba85cdcb
Author: John Haddon <thehad...@gmail.com>
Date: 2024-12-06 (Fri, 06 Dec 2024)
Changed paths:
M Changes.md
M python/GafferSceneTest/MergeScenesTest.py
M src/GafferScene/MergeScenes.cpp
Log Message:
-----------
MergeScenes : Fix handling of inputs without a computed source
Examples of such an input might be a promoted plug that hasn't yet been connected to anything. In this case we were treating that input as active for every single location declared by the other inputs, and if it was the first input it would take precedence over the other inputs when in Keep mode. This would mean all attributes being lost from the location.
I did look into an alternative fix : defaulting `ScenePlug.exists` to false. But that caused problems for the Parent node when omitting the primary input and parenting children to `/`. There just is no good default value for `exists`; it should be true for the root and false for all other locations.
Commit: a6f44595d47568a074dfa3f1580deb9a53591581
https://github.com/GafferHQ/gaffer/commit/a6f44595d47568a074dfa3f1580deb9a53591581
M src/GafferScene/MergeScenes.cpp
Log Message:
-----------
Merge pull request #6174 from johnhaddon/mergeScenesFixes
MergeScenes bugfix
Commit: 300dda0b3ded7d82a9e31f47a3fd0280e8d3ace2
https://github.com/GafferHQ/gaffer/commit/300dda0b3ded7d82a9e31f47a3fd0280e8d3ace2
Author: John Haddon <thehad...@gmail.com>
Date: 2024-12-09 (Mon, 09 Dec 2024)
Changed paths:
M Changes.md
M python/GafferImageUI/CatalogueUI.py
Log Message:
-----------
CatalogueUI : Don't "steal" irrelevant drags
We were accepting any drag which provided StringVectorData, when we should only have been accepting those which originated in the image listing (because we are using the drag to reorder images). This meant we were accepting drags of paths from the HierarchyView, and then clobbering the custom pointer in `__pathListingDragLeave`. This gave people the impression that the drag was broken, when in fact you could still continue and drop elsewhere (despite the pointer indicating otherwise).
Also tweaked the drag move logic so we use exactly the same checks in both enter and move.
Commit: dc38e12468bd1e3ecfe3e73468cf1a54bf8f5948
https://github.com/GafferHQ/gaffer/commit/dc38e12468bd1e3ecfe3e73468cf1a54bf8f5948
Author: John Haddon <thehad...@gmail.com>
Date: 2024-12-09 (Mon, 09 Dec 2024)
Changed paths:
M Changes.md
M python/GafferImageUI/CatalogueUI.py
Log Message:
-----------
Merge pull request #6168 from johnhaddon/catalogueDragFix
CatalogueUI : Don't "steal" irrelevant drags
Commit: 092681ff0bd6be9a1cfa1806dda98d487a502785
https://github.com/GafferHQ/gaffer/commit/092681ff0bd6be9a1cfa1806dda98d487a502785
M src/GafferUI/FPSGadget.cpp
Log Message:
-----------
Merge pull request #6171 from ericmehl/FPSGadgetLayer
FPS Gadget to Front Layer
Commit: b1743062ec745fadd7002c2e896e67c0f0187f3b
https://github.com/GafferHQ/gaffer/commit/b1743062ec745fadd7002c2e896e67c0f0187f3b
M .github/workflows/main.yml
A .github/workflows/main/installONNX.py
M .github/workflows/main/sconsOptions
M Changes.md
M SConstruct
M bin/gaffer
M bin/gaffer.cmd
M config/jh/options
A include/GafferML/DataToTensor.h
A include/GafferML/DataToTensor.inl
A include/GafferML/Export.h
A include/GafferML/ImageToTensor.h
A include/GafferML/Inference.h
A include/GafferML/Tensor.h
A include/GafferML/TensorPlug.h
A include/GafferML/TensorToImage.h
A include/GafferML/TypeIds.h
M python/GafferImageUI/CatalogueUI.py
A python/GafferML/__init__.py
A python/GafferMLTest/DataToTensorTest.py
A python/GafferMLTest/ImageToTensorTest.py
A python/GafferMLTest/InferenceTest.py
A python/GafferMLTest/TensorPlugTest.py
A python/GafferMLTest/TensorTest.py
A python/GafferMLTest/TensorToImageTest.py
A python/GafferMLTest/__init__.py
A python/GafferMLTest/models/add.onnx
A python/GafferMLUI/DataToTensorUI.py
A python/GafferMLUI/ImageToTensorUI.py
A python/GafferMLUI/InferenceUI.py
A python/GafferMLUI/TensorToImageUI.py
A python/GafferMLUI/__init__.py
A python/GafferMLUITest/DocumentationTest.py
A python/GafferMLUITest/NodeUITest.py
A python/GafferMLUITest/__init__.py
M python/GafferSceneTest/MergeScenesTest.py
M python/GafferSceneUI/PathFilterUI.py
M python/GafferSceneUI/SetFilterUI.py
M python/GafferUI/ColorChooserPlugValueWidget.py
M python/GafferUI/ColorSwatchPlugValueWidget.py
M python/GafferUI/GadgetWidget.py
M python/GafferUI/PlugLayout.py
A src/GafferML/ImageToTensor.cpp
A src/GafferML/Inference.cpp
A src/GafferML/Tensor.cpp
A src/GafferML/TensorPlug.cpp
A src/GafferML/TensorToImage.cpp
A src/GafferMLModule/GafferMLModule.cpp
M src/GafferScene/MergeScenes.cpp
M src/GafferUI/FPSGadget.cpp
M startup/gui/graphEditor.py
M startup/gui/menus.py
Log Message:
-----------
Merge branch '1.5_maintenance'
Compare: https://github.com/GafferHQ/gaffer/compare/10c8f0ee5a0c...b1743062ec74
https://github.com/GafferHQ/gaffer/commit/74d9bfc592ecbf6a3194e8327859c51b728af9b5
Author: Eric Mehl <er...@thinkhypothetical.com>
Date: 2024-11-22 (Fri, 22 Nov 2024)
Changed paths:
M python/GafferUI/ColorChooserPlugValueWidget.py
Changed paths:
M python/GafferUI/ColorSwatchPlugValueWidget.py
Log Message:
-----------
Color*PlugValueWidget : Removed `scoped = False`
Commit: 23228363e83acd230c8bfcb55a308a98c3c68964
https://github.com/GafferHQ/gaffer/commit/23228363e83acd230c8bfcb55a308a98c3c68964
Author: John Haddon <thehad...@gmail.com>
Date: 2024-11-25 (Mon, 25 Nov 2024)
Changed paths:
M python/GafferUI/ColorChooserPlugValueWidget.py
M python/GafferUI/ColorSwatchPlugValueWidget.py
Log Message:
-----------
Merge pull request #6160 from ericmehl/cleanScopedSignals
Color*PlugValueWidget : Removed `scoped = False`
Commit: 724d1828f570183c3c0a860e1d364f1389ee2a09
https://github.com/GafferHQ/gaffer/commit/724d1828f570183c3c0a860e1d364f1389ee2a09
Author: John Haddon <thehad...@gmail.com>
Date: 2024-11-26 (Tue, 26 Nov 2024)
Changed paths:
M Changes.md
M python/GafferUI/PlugLayout.py
Log Message:
-----------
PlugLayout : Update activations when children added/removed
Commit: 597afa5f0778af6cbf72def1cf725d8735c50835
https://github.com/GafferHQ/gaffer/commit/597afa5f0778af6cbf72def1cf725d8735c50835
Author: John Haddon <thehad...@gmail.com>
Date: 2024-11-26 (Tue, 26 Nov 2024)
Changed paths:
M SConstruct
M bin/gaffer
M bin/gaffer.cmd
A include/GafferML/Export.h
A include/GafferML/TypeIds.h
A python/GafferML/__init__.py
A python/GafferMLTest/__init__.py
A python/GafferMLUI/__init__.py
A python/GafferMLUITest/DocumentationTest.py
A python/GafferMLUITest/NodeUITest.py
A python/GafferMLUITest/__init__.py
A src/GafferMLModule/GafferMLModule.cpp
Log Message:
-----------
GafferML : Add library and module boilerplate
Commit: 24ec3f10fecf850cb397dd40f232548f893ab7ba
https://github.com/GafferHQ/gaffer/commit/24ec3f10fecf850cb397dd40f232548f893ab7ba
Author: John Haddon <thehad...@gmail.com>
Date: 2024-11-26 (Tue, 26 Nov 2024)
Changed paths:
M config/jh/options
Log Message:
-----------
JH config : Build GafferML
Commit: 0e5eb746dffe6d8aa1481d33696676eaed84bd44
https://github.com/GafferHQ/gaffer/commit/0e5eb746dffe6d8aa1481d33696676eaed84bd44
Author: John Haddon <thehad...@gmail.com>
Date: 2024-11-26 (Tue, 26 Nov 2024)
Changed paths:
A include/GafferML/Tensor.h
A python/GafferMLTest/TensorTest.py
M python/GafferMLTest/__init__.py
A src/GafferML/Tensor.cpp
M src/GafferMLModule/GafferMLModule.cpp
Log Message:
-----------
GafferML : Add Tensor class
This is a wrapper class that will allow us to pass ONNX values through Gaffer's computation graph.
Commit: 7728139de8263728fb2c6c6dbc19ba6a89a624d6
https://github.com/GafferHQ/gaffer/commit/7728139de8263728fb2c6c6dbc19ba6a89a624d6
Author: John Haddon <thehad...@gmail.com>
Date: 2024-11-26 (Tue, 26 Nov 2024)
Changed paths:
A include/GafferML/TensorPlug.h
A python/GafferMLTest/TensorPlugTest.py
M python/GafferMLTest/__init__.py
A src/GafferML/TensorPlug.cpp
M src/GafferMLModule/GafferMLModule.cpp
Log Message:
-----------
GafferML : Add TensorPlug
This will be used for passing Tensor values between nodes.
Commit: 5dcee4ce26b5de7962674fce4808139b39f29c6b
https://github.com/GafferHQ/gaffer/commit/5dcee4ce26b5de7962674fce4808139b39f29c6b
Author: John Haddon <thehad...@gmail.com>
Date: 2024-11-26 (Tue, 26 Nov 2024)
Changed paths:
A include/GafferML/DataToTensor.h
A include/GafferML/DataToTensor.inl
A python/GafferMLTest/DataToTensorTest.py
M python/GafferMLTest/__init__.py
A python/GafferMLUI/DataToTensorUI.py
M python/GafferMLUI/__init__.py
A src/GafferML/DataToTensor.cpp
M src/GafferMLModule/GafferMLModule.cpp
Log Message:
-----------
GafferML : Add DataToTensor node
This allows data from elsewhere in Gaffer to be converted for use in GafferML.
Commit: df99cff95b1f4b4bf2e8ccb9e6f2d882897c895b
https://github.com/GafferHQ/gaffer/commit/df99cff95b1f4b4bf2e8ccb9e6f2d882897c895b
Author: John Haddon <thehad...@gmail.com>
Date: 2024-11-26 (Tue, 26 Nov 2024)
Changed paths:
A include/GafferML/Inference.h
A python/GafferMLTest/InferenceTest.py
M python/GafferMLTest/__init__.py
A python/GafferMLTest/models/add.onnx
A python/GafferMLUI/InferenceUI.py
M python/GafferMLUI/__init__.py
A src/GafferML/Inference.cpp
M src/GafferMLModule/GafferMLModule.cpp
Log Message:
-----------
GafferML : Add Inference node
This forms the meat of GafferML, loading ONNX models and performing inference using data from an array of input TensorPlugs.
Commit: 6d95369782e8013882d16fd23f9d82aa86d04394
https://github.com/GafferHQ/gaffer/commit/6d95369782e8013882d16fd23f9d82aa86d04394
Author: John Haddon <thehad...@gmail.com>
Date: 2024-11-26 (Tue, 26 Nov 2024)
Changed paths:
A include/GafferML/ImageToTensor.h
A python/GafferMLTest/ImageToTensorTest.py
M python/GafferMLTest/__init__.py
A python/GafferMLUI/ImageToTensorUI.py
M python/GafferMLUI/__init__.py
A src/GafferML/ImageToTensor.cpp
M src/GafferMLModule/GafferMLModule.cpp
Log Message:
-----------
GafferML : Add ImageToTensor
This is a node which converts images from GafferImage into tensors for use by the Inference node.
Commit: 5e886b922984cae8aacf90f51e2921eab193c950
https://github.com/GafferHQ/gaffer/commit/5e886b922984cae8aacf90f51e2921eab193c950
Author: John Haddon <thehad...@gmail.com>
Date: 2024-11-26 (Tue, 26 Nov 2024)
Changed paths:
A include/GafferML/TensorToImage.h
A python/GafferMLTest/TensorToImageTest.py
M python/GafferMLTest/__init__.py
A python/GafferMLUI/TensorToImageUI.py
M python/GafferMLUI/__init__.py
A src/GafferML/TensorToImage.cpp
M src/GafferMLModule/GafferMLModule.cpp
Log Message:
-----------
GafferML : Add TensorToImage
This allows tensors to be converted back to GafferImage images, after they have been processed by the Inference node.
Commit: a4cf447b4ae4a92f8837bf63a01d78b7be354991
https://github.com/GafferHQ/gaffer/commit/a4cf447b4ae4a92f8837bf63a01d78b7be354991
Author: John Haddon <thehad...@gmail.com>
Date: 2024-11-26 (Tue, 26 Nov 2024)
Changed paths:
M Changes.md
M startup/gui/menus.py
Log Message:
-----------
GUI startup : Add GafferML nodes to NodeMenu
And advertise them in Changes.md.
Commit: 1e151d04697e8e297da39f8c2c7f8d1553427583
https://github.com/GafferHQ/gaffer/commit/1e151d04697e8e297da39f8c2c7f8d1553427583
Author: John Haddon <thehad...@gmail.com>
Date: 2024-11-26 (Tue, 26 Nov 2024)
Changed paths:
M .github/workflows/main.yml
A .github/workflows/main/installONNX.py
M .github/workflows/main/sconsOptions
Log Message:
-----------
CI : Build and test GafferML
Commit: 674f3a8b1ab5f2eea707baa9e9d589ccda0d4555
https://github.com/GafferHQ/gaffer/commit/674f3a8b1ab5f2eea707baa9e9d589ccda0d4555
Author: John Haddon <thehad...@gmail.com>
Date: 2024-11-26 (Tue, 26 Nov 2024)
Changed paths:
M python/GafferMLTest/TensorToImageTest.py
M src/GafferML/TensorToImage.cpp
Log Message:
-----------
TensorToImage : Check tensor data type
https://github.com/GafferHQ/gaffer/commit/df8c4980fc4d7fe51e8d9d85abb6b39ff37c653d
M .github/workflows/main.yml
A .github/workflows/main/installONNX.py
M .github/workflows/main/sconsOptions
M Changes.md
M SConstruct
M bin/gaffer
M bin/gaffer.cmd
M config/jh/options
A include/GafferML/DataToTensor.h
A include/GafferML/DataToTensor.inl
A include/GafferML/Export.h
A include/GafferML/ImageToTensor.h
A include/GafferML/Inference.h
A include/GafferML/Tensor.h
A include/GafferML/TensorPlug.h
A include/GafferML/TensorToImage.h
A include/GafferML/TypeIds.h
A python/GafferML/__init__.py
A python/GafferMLTest/DataToTensorTest.py
A python/GafferMLTest/ImageToTensorTest.py
A python/GafferMLTest/InferenceTest.py
A python/GafferMLTest/TensorPlugTest.py
A python/GafferMLTest/TensorTest.py
A python/GafferMLTest/TensorToImageTest.py
A python/GafferMLTest/__init__.py
A python/GafferMLTest/models/add.onnx
A python/GafferMLUI/DataToTensorUI.py
A python/GafferMLUI/ImageToTensorUI.py
A python/GafferMLUI/InferenceUI.py
A python/GafferMLUI/TensorToImageUI.py
A python/GafferMLUI/__init__.py
A python/GafferMLUITest/DocumentationTest.py
A python/GafferMLUITest/NodeUITest.py
A python/GafferMLUITest/__init__.py
M python/GafferUI/PlugLayout.py
A src/GafferML/DataToTensor.cpp
A src/GafferML/ImageToTensor.cpp
A src/GafferML/Inference.cpp
A src/GafferML/Tensor.cpp
A src/GafferML/TensorPlug.cpp
A src/GafferML/TensorToImage.cpp
A src/GafferMLModule/GafferMLModule.cpp
M startup/gui/menus.py
Log Message:
-----------
Merge pull request #6150 from johnhaddon/onnx
GafferML
Commit: f45b0f11d91355e648ce67eef353f7bbebcd98a4
https://github.com/GafferHQ/gaffer/commit/f45b0f11d91355e648ce67eef353f7bbebcd98a4
Author: Murray Stevenson <50844517+mur...@users.noreply.github.com>
Date: 2024-11-29 (Fri, 29 Nov 2024)
Changed paths:
M Changes.md
M python/GafferUI/Widget.py
M startup/gui/graphEditor.py
Log Message:
-----------
Merge pull request #6163 from johnhaddon/dragDropFixes
Small drag & drop fixes
https://github.com/GafferHQ/gaffer/commit/ed8273195de13c5aa27196cb03d2b384351d824e
Author: Eric Mehl <er...@thinkhypothetical.com>
Date: 2024-12-04 (Wed, 04 Dec 2024)
Changed paths:
M src/GafferUI/FPSGadget.cpp
Log Message:
-----------
FPSGadget : Draw on `Front` layer
Commit: f5ca501954f9aacc1cdefc9ce3fc1c03b0354218
https://github.com/GafferHQ/gaffer/commit/f5ca501954f9aacc1cdefc9ce3fc1c03b0354218
Author: John Haddon <thehad...@gmail.com>
Date: 2024-12-05 (Thu, 05 Dec 2024)
Changed paths:
M src/GafferScene/MergeScenes.cpp
Log Message:
-----------
MergeScenes : Reduce code duplication
Commit: dd1e11a09f29f95ed265f0233a00d08d7f595866
https://github.com/GafferHQ/gaffer/commit/dd1e11a09f29f95ed265f0233a00d08d7f595866
Author: John Haddon <thehad...@gmail.com>
Date: 2024-12-05 (Thu, 05 Dec 2024)
Changed paths:
M Changes.md
M src/GafferScene/MergeScenes.cpp
Log Message:
-----------
MergeScenes : Remove unnecessary temporary contexts
We're already in the right context to call `existsPlug()->getValue()` directly. Instead we were calling `exists()` which was constructing a new context identical to the one we already had.
Commit: 673d38488ee86f9a75ff0012ccf08e44ba85cdcb
https://github.com/GafferHQ/gaffer/commit/673d38488ee86f9a75ff0012ccf08e44ba85cdcb
Author: John Haddon <thehad...@gmail.com>
Date: 2024-12-06 (Fri, 06 Dec 2024)
Changed paths:
M Changes.md
M python/GafferSceneTest/MergeScenesTest.py
M src/GafferScene/MergeScenes.cpp
Log Message:
-----------
MergeScenes : Fix handling of inputs without a computed source
Examples of such an input might be a promoted plug that hasn't yet been connected to anything. In this case we were treating that input as active for every single location declared by the other inputs, and if it was the first input it would take precedence over the other inputs when in Keep mode. This would mean all attributes being lost from the location.
I did look into an alternative fix : defaulting `ScenePlug.exists` to false. But that caused problems for the Parent node when omitting the primary input and parenting children to `/`. There just is no good default value for `exists`; it should be true for the root and false for all other locations.
Commit: a6f44595d47568a074dfa3f1580deb9a53591581
https://github.com/GafferHQ/gaffer/commit/a6f44595d47568a074dfa3f1580deb9a53591581
Author: John Haddon <thehad...@gmail.com>
Date: 2024-12-09 (Mon, 09 Dec 2024)
Changed paths:
M Changes.md
M python/GafferSceneTest/MergeScenesTest.py
Date: 2024-12-09 (Mon, 09 Dec 2024)
Changed paths:
M Changes.md
M src/GafferScene/MergeScenes.cpp
Log Message:
-----------
Merge pull request #6174 from johnhaddon/mergeScenesFixes
MergeScenes bugfix
Commit: 300dda0b3ded7d82a9e31f47a3fd0280e8d3ace2
https://github.com/GafferHQ/gaffer/commit/300dda0b3ded7d82a9e31f47a3fd0280e8d3ace2
Author: John Haddon <thehad...@gmail.com>
Date: 2024-12-09 (Mon, 09 Dec 2024)
Changed paths:
M Changes.md
M python/GafferImageUI/CatalogueUI.py
Log Message:
-----------
CatalogueUI : Don't "steal" irrelevant drags
We were accepting any drag which provided StringVectorData, when we should only have been accepting those which originated in the image listing (because we are using the drag to reorder images). This meant we were accepting drags of paths from the HierarchyView, and then clobbering the custom pointer in `__pathListingDragLeave`. This gave people the impression that the drag was broken, when in fact you could still continue and drop elsewhere (despite the pointer indicating otherwise).
Also tweaked the drag move logic so we use exactly the same checks in both enter and move.
Commit: dc38e12468bd1e3ecfe3e73468cf1a54bf8f5948
https://github.com/GafferHQ/gaffer/commit/dc38e12468bd1e3ecfe3e73468cf1a54bf8f5948
Author: John Haddon <thehad...@gmail.com>
Date: 2024-12-09 (Mon, 09 Dec 2024)
Changed paths:
M Changes.md
M python/GafferImageUI/CatalogueUI.py
Log Message:
-----------
Merge pull request #6168 from johnhaddon/catalogueDragFix
CatalogueUI : Don't "steal" irrelevant drags
https://github.com/GafferHQ/gaffer/commit/092681ff0bd6be9a1cfa1806dda98d487a502785
M src/GafferUI/FPSGadget.cpp
Log Message:
-----------
Merge pull request #6171 from ericmehl/FPSGadgetLayer
FPS Gadget to Front Layer
https://github.com/GafferHQ/gaffer/commit/b1743062ec745fadd7002c2e896e67c0f0187f3b
M .github/workflows/main.yml
A .github/workflows/main/installONNX.py
M .github/workflows/main/sconsOptions
M Changes.md
M SConstruct
M bin/gaffer
M bin/gaffer.cmd
M config/jh/options
A include/GafferML/DataToTensor.h
A include/GafferML/DataToTensor.inl
A include/GafferML/Export.h
A include/GafferML/ImageToTensor.h
A include/GafferML/Inference.h
A include/GafferML/Tensor.h
A include/GafferML/TensorPlug.h
A include/GafferML/TensorToImage.h
A include/GafferML/TypeIds.h
M python/GafferImageUI/CatalogueUI.py
A python/GafferML/__init__.py
A python/GafferMLTest/DataToTensorTest.py
A python/GafferMLTest/ImageToTensorTest.py
A python/GafferMLTest/InferenceTest.py
A python/GafferMLTest/TensorPlugTest.py
A python/GafferMLTest/TensorTest.py
A python/GafferMLTest/TensorToImageTest.py
A python/GafferMLTest/__init__.py
A python/GafferMLTest/models/add.onnx
A python/GafferMLUI/DataToTensorUI.py
A python/GafferMLUI/ImageToTensorUI.py
A python/GafferMLUI/InferenceUI.py
A python/GafferMLUI/TensorToImageUI.py
A python/GafferMLUI/__init__.py
A python/GafferMLUITest/DocumentationTest.py
A python/GafferMLUITest/NodeUITest.py
A python/GafferMLUITest/__init__.py
M python/GafferSceneTest/MergeScenesTest.py
M python/GafferSceneUI/PathFilterUI.py
M python/GafferSceneUI/SetFilterUI.py
M python/GafferUI/ColorChooserPlugValueWidget.py
M python/GafferUI/ColorSwatchPlugValueWidget.py
M python/GafferUI/GadgetWidget.py
M python/GafferUI/PlugLayout.py
M python/GafferUI/VectorDataWidget.py
M python/GafferUI/Widget.py
M python/GafferUITest/GadgetWidgetTest.py
A src/GafferML/DataToTensor.cpp
M python/GafferUI/Widget.py
M python/GafferUITest/GadgetWidgetTest.py
A src/GafferML/ImageToTensor.cpp
A src/GafferML/Inference.cpp
A src/GafferML/Tensor.cpp
A src/GafferML/TensorPlug.cpp
A src/GafferML/TensorToImage.cpp
A src/GafferMLModule/GafferMLModule.cpp
M src/GafferScene/MergeScenes.cpp
M src/GafferUI/FPSGadget.cpp
M startup/gui/graphEditor.py
M startup/gui/menus.py
Log Message:
-----------
Merge branch '1.5_maintenance'
Compare: https://github.com/GafferHQ/gaffer/compare/10c8f0ee5a0c...b1743062ec74
Reply all
Reply to author
Forward
0 new messages