Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main/installDependencies.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@

# Determine default archive URL.

defaultURL = "https://github.com/ImageEngine/cortex/releases/download/10.7.0.0a1/cortex-10.7.0.0a1-{platform}{buildEnvironment}.{extension}"
defaultURL = "https://github.com/ImageEngine/cortex/releases/download/10.7.0.0a3/cortex-10.7.0.0a3-{platform}{buildEnvironment}.{extension}"

# Parse command line arguments.

Expand Down
5 changes: 5 additions & 0 deletions Changes.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ Breaking Changes
- OSL Shaders : Pattern/FloatSpline and Pattern/ColorSpline have been replaced by Pattern/FloatRamp and Pattern/ColorRamp. Old Gaffer scripts will automatically be updated on load, files exported from Gaffer will contain the new shaders. ( The .osl files for the old shaders are still included, so that old USD files can render ).
- GafferUI : Renamed SplineWidget to RampWidget. Renamed SplinePlugValueWidget to RampPlugValueWidget. The old RampPlugValueWidget is no longer exposed, since it was only used internally.

Build
-----

- Cortex : Updated to version 10.7.0.0a3.

1.6.x.x (relative to 1.6.8.0)
=======

Expand Down
4 changes: 2 additions & 2 deletions python/GafferTest/ApplicationTest.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@

class ApplicationTest( GafferTest.TestCase ) :

def testTaskSchedulerInitDoesntSuppressExceptions( self ) :
def testTBBGlobalControlDoesntSuppressExceptions( self ) :

def f() :

with IECore.tbb_task_scheduler_init( IECore.tbb_task_scheduler_init.automatic ) :
with IECore.tbb_global_control( IECore.tbb_global_control.parameter.max_allowed_parallelism, IECore.hardwareConcurrency() ) :
raise Exception( "Woops!")

self.assertRaises( Exception, f )
Expand Down