Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: GafferHQ/gaffer
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.4.15.0
Choose a base ref
...
head repository: GafferHQ/gaffer
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1.4_maintenance
Choose a head ref

Commits on Oct 31, 2024

  1. PlugPopup : Fix error when popups have no PlugValueWidget

    This could occur when a popup was created from multiple plugs of differing type, where we'd display a message rather than a PlugValueWidget.
    murraystevenson committed Oct 31, 2024
    Copy the full SHA
    d70acf7 View commit details
  2. Merge pull request #6123 from murraystevenson/plugPopupFix

    PlugPopup : Fix error when popups have no PlugValueWidget
    johnhaddon authored Oct 31, 2024
    Copy the full SHA
    5e88e02 View commit details
  3. Bump version to 1.4.15.1

    johnhaddon committed Oct 31, 2024
    Copy the full SHA
    57a21be View commit details

Commits on Nov 18, 2024

  1. Copy the full SHA
    863be3d View commit details
  2. Copy the full SHA
    42f7ab3 View commit details

Commits on Nov 19, 2024

  1. Merge pull request #6137 from ericmehl/dropReadOnlyPathFilterFix

    PathFilter : Fix dropping paths onto read-only nodes
    murraystevenson authored Nov 19, 2024
    Copy the full SHA
    535a1b8 View commit details

Commits on Nov 20, 2024

  1. CI : Drop GCC9 builds

    murraystevenson committed Nov 20, 2024
    Copy the full SHA
    c1be2da View commit details
  2. Copy the full SHA
    7ddf9b1 View commit details
  3. Merge pull request #6152 from murraystevenson/farewellGCC9

    CI : Drop GCC9 builds for `1.4_maintenance`
    johnhaddon authored Nov 20, 2024
    Copy the full SHA
    b334e69 View commit details

Commits on Nov 22, 2024

  1. Bump version to 1.4.15.2

    johnhaddon committed Nov 22, 2024
    Copy the full SHA
    4a8b9fe View commit details

Commits on Nov 27, 2024

  1. 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.
    johnhaddon committed Nov 27, 2024
    Copy the full SHA
    a698791 View commit details
  2. 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.
    johnhaddon committed Nov 27, 2024
    Copy the full SHA
    5d19325 View commit details

Commits on Nov 30, 2024

  1. Merge pull request #6163 from johnhaddon/dragDropFixes

    Small drag & drop fixes
    murraystevenson authored Nov 30, 2024
    Copy the full SHA
    f45b0f1 View commit details

Commits on Dec 9, 2024

  1. 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.
    johnhaddon committed Dec 9, 2024
    Copy the full SHA
    300dda0 View commit details
  2. Merge pull request #6168 from johnhaddon/catalogueDragFix

    CatalogueUI : Don't "steal" irrelevant drags
    johnhaddon authored Dec 9, 2024
    Copy the full SHA
    dc38e12 View commit details

Commits on Dec 10, 2024

  1. GadgetWidget : Fix signal handling bug

    This was broken in 9e05238, 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.
    johnhaddon committed Dec 10, 2024
    Copy the full SHA
    6d0ae46 View commit details
  2. Merge pull request #6169 from johnhaddon/gadgetWidgetFix

    GadgetWidget : Fix signal handling bug
    johnhaddon authored Dec 10, 2024
    Copy the full SHA
    f3b7898 View commit details
  3. 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.
    johnhaddon committed Dec 10, 2024
    Copy the full SHA
    a39cdf0 View commit details
  4. 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*)
    ```
    johnhaddon committed Dec 10, 2024
    Copy the full SHA
    1d8403c View commit details
  5. Merge pull request #6179 from johnhaddon/arrayPlugCompat

    ArrayPlug : Fix loading of dynamic ArrayPlugs saved in Gaffer 1.5+
    murraystevenson authored Dec 10, 2024
    Copy the full SHA
    fe384e4 View commit details
  6. Merge pull request #6180 from johnhaddon/randomChoiceUIFix

    RandomChoiceUI : Fix handling of non-ValuePlugs
    ericmehl authored Dec 10, 2024
    Copy the full SHA
    2e0c9ca View commit details

Commits on Dec 13, 2024

  1. Bump version to 1.4.15.3

    johnhaddon committed Dec 13, 2024
    Copy the full SHA
    97c574b View commit details
Loading