Skip to content

Commit

Permalink
Merge branch '1.4_maintenance'
Browse files Browse the repository at this point in the history
  • Loading branch information
johnhaddon committed Jul 15, 2024
2 parents a0074d3 + 1936a34 commit 79970a7
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 2 deletions.
8 changes: 7 additions & 1 deletion Changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,12 @@ Breaking Changes
- Removed `setContext()` methods.
- Deprecated `getContext()` methods. Use `context()` instead.

1.4.x.x (relative to 1.4.8.0)
1.4.x.x (relative to 1.4.9.0)
=======



1.4.9.0 (relative to 1.4.8.0)
=======

Improvements
Expand Down Expand Up @@ -83,6 +88,7 @@ Fixes
- LightEditor : Fixed regression (introduced in 1.4.8.0) causing the mute and solo icons to not show up for groups.
- Windows : Fixed conflicts with other software installations on `PATH`. The `PXR_USD_WINDOWS_DLL_PATH` environment variable is now set to an empty string if it is not already set, preventing USD from adding all entries from `PATH` to Python's DLL search paths.
- AnnotationsGadget : Fixed potential hang in `annotationText()` Python binding.
- FormatPlug : Fixed potential hang in `acquireDefaultFormatPlug()` Python binding.
- ImageReader : Fixed array metadata loading bugs, including the loading of `ICCProfile` metadata.

API
Expand Down
8 changes: 7 additions & 1 deletion src/GafferImageModule/CoreBinding.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,12 @@ Format getValue( const FormatPlug *plug )
return plug->getValue();
}

FormatPlugPtr acquireDefaultFormatPlugWrapper( Gaffer::ScriptNode &scriptNode )
{
IECorePython::ScopedGILRelease gilRelease;
return FormatPlug::acquireDefaultFormatPlug( &scriptNode );
}

class FormatPlugSerialiser : public GafferBindings::ValuePlugSerialiser
{

Expand Down Expand Up @@ -431,7 +437,7 @@ void GafferImageModule::bindCore()
.staticmethod( "setDefaultFormat" )
.def( "getDefaultFormat", &FormatPlug::getDefaultFormat )
.staticmethod( "getDefaultFormat" )
.def( "acquireDefaultFormatPlug", &FormatPlug::acquireDefaultFormatPlug, return_value_policy<IECorePython::CastToIntrusivePtr>() )
.def( "acquireDefaultFormatPlug", &acquireDefaultFormatPlugWrapper )
.staticmethod( "acquireDefaultFormatPlug" )
;

Expand Down

0 comments on commit 79970a7

Please sign in to comment.