RB-2.5 => RB-2.6 Merge fixes #989
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Bountysource appears to be dead, so it should be removed
Minor readme fixes
Debug build fix
CMake: Debug build type fix
Msys2 updated gcc in the last few days which has caused the package repo build to fail. Here are some minor fixes to make the build work again. - Add fmt to openimageio's dependency list since the version included with the openimageio source now appears to cause an internal compiler error. - Added an include for math.h to in a libsox test file to make the compiler stop generating an error about fabs() not being defined. - Fix type mismatch and missing declaration errors in ImageMagick. - Updated mingw-w64-dump_syms gitcommit to point to a version that fixes a missing header build error.
…#969) Msys2's libcurl package was recently updated to enable HTTP/3 support which means it now also depends on libnghttp3. genDllVersions.sh was updated to include this new dependency. The Windows installer build action was also changed to upload its build artifacts before it tests to make sure the plugins load. This makes it possible to look at the generated artifacts for missing dependencies if the plugin load verification fails.
- Force Shiboken to use detected python libraries instead of using its own library detection logic. - Specify -O compiler option for debug builds like the qmake build. - Remove unconditional NDEBUG define added by the Shiboken cmake helper so that asserts work correctly on debug builds.
This fixes asserts in debug builds where Qt's GL context is set when a ScopedGLContext is created. This can happen when we have a project open and the user tries to open another project. When the event callback is dispatched, the Qt GL context is still set. The fix justs removes the assert and adds logic to save and restore any existing GL context that is set.
* RotoPaint: always draw the overlay when the tool is part of the overlay
|
LGTM |
devernay
approved these changes
Jul 22, 2024
| @@ -0,0 +1,242 @@ | |||
| @@ -2,7 +2,6 @@ | |||
There was a problem hiding this comment.
this file was committed by mistake, please remove
| @@ -0,0 +1,234 @@ | |||
| @@ -17,7 +18,6 @@ | |||
There was a problem hiding this comment.
this file was committed by mistake, please remove
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merge RB-2.5 into RB-2.6 with resolved conflicts. Please double check that everything is ok.