From 59ba82e415d396ad8f42d654d2bf22cc2f8a587f Mon Sep 17 00:00:00 2001 From: christopherle Date: Fri, 21 Jun 2024 14:02:33 -0700 Subject: [PATCH 1/4] LazyMethod : Fix running idle callback without a valid Qt Widget By checking for a valid Qt widget as well, we avoid instances in which the Gaffer widget is still around but the the Qt widget as been cleaned up which can cause issues when running the callback given that the Qt widget is the underlying widget for the Gaffer widget --- Changes.md | 3 +++ python/GafferUI/LazyMethod.py | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Changes.md b/Changes.md index e72a5d81399..8f664c19274 100644 --- a/Changes.md +++ b/Changes.md @@ -1,6 +1,9 @@ 1.3.16.x (relative to 1.3.16.5) ======== +Fixes +----- +- LazyMethod : Fixed error caused by running idle callbacks without a valid Qt Widget 1.3.16.5 (relative to 1.3.16.4) diff --git a/python/GafferUI/LazyMethod.py b/python/GafferUI/LazyMethod.py index 7a974e73e53..6d5458df337 100644 --- a/python/GafferUI/LazyMethod.py +++ b/python/GafferUI/LazyMethod.py @@ -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 ) From 2a1aebf66f52270e3f1ace7daf1c5f2841b26feb Mon Sep 17 00:00:00 2001 From: Murray Stevenson <50844517+murraystevenson@users.noreply.github.com> Date: Fri, 21 Jun 2024 17:14:04 -0700 Subject: [PATCH 2/4] CI : Increase Windows SCons cache The existing limit of 400MB wasn't enough to cache a full build. While this new limit is double the previous, in testing, the resulting compressed Windows build cache is only about 20MB larger than the compressed Linux release build cache (~100MB vs ~80MB). --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bbbb965eed5..089b79b25e2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -65,7 +65,7 @@ jobs: containerImage: testRunner: Invoke-Expression testArguments: -excludedCategories performance GafferTest GafferVDBTest GafferUSDTest GafferSceneTest GafferDispatchTest GafferOSLTest GafferImageTest GafferUITest GafferImageUITest GafferSceneUITest GafferDispatchUITest GafferOSLUITest GafferUSDUITest GafferVDBUITest GafferDelightUITest - sconsCacheMegabytes: 400 + sconsCacheMegabytes: 800 runs-on: ${{ matrix.os }} From 427b8c881e5c3c3353877da21c71368e98584253 Mon Sep 17 00:00:00 2001 From: John Haddon Date: Mon, 24 Jun 2024 11:12:19 +0100 Subject: [PATCH 3/4] Changes.md : Tweak formatting --- Changes.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Changes.md b/Changes.md index 8f664c19274..08c1fd88d0f 100644 --- a/Changes.md +++ b/Changes.md @@ -1,10 +1,10 @@ 1.3.16.x (relative to 1.3.16.5) ======== + Fixes ----- -- LazyMethod : Fixed error caused by running idle callbacks without a valid Qt Widget - +- LazyMethod : Fixed errors caused by running idle callbacks without a valid Qt Widget. 1.3.16.5 (relative to 1.3.16.4) ======== From ef11bfc691e2364a0a4877438723b8724b73c72b Mon Sep 17 00:00:00 2001 From: Murray Stevenson <50844517+murraystevenson@users.noreply.github.com> Date: Mon, 24 Jun 2024 13:52:44 -0700 Subject: [PATCH 4/4] Bump version to 1.3.16.6 --- Changes.md | 7 ++++++- SConstruct | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Changes.md b/Changes.md index 08c1fd88d0f..e063673285d 100644 --- a/Changes.md +++ b/Changes.md @@ -1,4 +1,9 @@ -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 diff --git a/SConstruct b/SConstruct index dabd627f2a0..506e53a9db5 100644 --- a/SConstruct +++ b/SConstruct @@ -63,7 +63,7 @@ if codecs.lookup( locale.getpreferredencoding() ).name != "utf-8" : gafferMilestoneVersion = 1 # for announcing major milestones - may contain all of the below gafferMajorVersion = 3 # backwards-incompatible changes gafferMinorVersion = 16 # new backwards-compatible features -gafferPatchVersion = 5 # bug fixes +gafferPatchVersion = 6 # bug fixes gafferVersionSuffix = "" # used for alpha/beta releases : "a1", "b2", etc. # All of the following must be considered when determining