Skip to content

Commit

Permalink
Merge branch '1.3_maintenance' into 1.4_maintenance
Browse files Browse the repository at this point in the history
  • Loading branch information
murraystevenson committed Jun 24, 2024
2 parents e352897 + ef11bfc commit bc2085f
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ jobs:
containerImage:
testRunner: Invoke-Expression
testArguments: -excludedCategories performance GafferTest GafferVDBTest GafferUSDTest GafferSceneTest GafferDispatchTest GafferOSLTest GafferImageTest GafferUITest GafferImageUITest GafferSceneUITest GafferDispatchUITest GafferOSLUITest GafferUSDUITest GafferVDBUITest GafferDelightUITest GafferTractorTest GafferTractorUITest
sconsCacheMegabytes: 400
sconsCacheMegabytes: 800
jobs: 4

runs-on: ${{ matrix.os }}
Expand Down
11 changes: 10 additions & 1 deletion Changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ Fixes
- CodeWidget : Fixed bug that could prevent changes from being committed while the completion menu was visible.
- Loop : Fixed handling of empty `indexVariable`. This now disables the Loop instead of creating an unnamed context variable.
- ColorChooser : Fixed emission of `colorChangedSignal()` while the widget was in an inconsistent internal state.
- LazyMethod : Fixed errors caused by running idle callbacks without a valid Qt Widget.

API
---
Expand Down Expand Up @@ -605,11 +606,19 @@ Build
- Removed QtNetworkAuth library.
- USD : Updated to version 23.11.

1.3.16.x (relative to 1.3.16.5)
1.3.16.x (relative to 1.3.16.6)
========



1.3.16.6 (relative to 1.3.16.5)
========

Fixes
-----

- LazyMethod : Fixed errors caused by running idle callbacks without a valid Qt Widget.

1.3.16.5 (relative to 1.3.16.4)
========

Expand Down
2 changes: 1 addition & 1 deletion python/GafferUI/LazyMethod.py
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ def __playbackStateChanged( cls, playback, widgetWeakref, method ) :
def __idle( cls, widgetWeakref, method ) :

widget = widgetWeakref()
if widget is None :
if widget is None or not GafferUI._qtObjectIsValid( widget._qtWidget() ):
return

cls.__doPendingCalls( widget, method )
Expand Down

0 comments on commit bc2085f

Please sign in to comment.