diff --git a/Changes.md b/Changes.md index 2534c825c6b..4e7f71e50d4 100644 --- a/Changes.md +++ b/Changes.md @@ -7,6 +7,7 @@ Features - SelectionTool : Added select mode plug. When set to anything except `Standard` using the SelectionTool causes the actual scene location selected to potentially be modified from the originally selected location. Selection modifiers work identically for deselection. Currently, two selectors are implemented : - USD Kind : When selecting, the first ancestor location with a `usd:kind` attribute matching the chosen list of USD Kind will ultimately be selected. USD's Kind Registry includes `Assembly`, `Component`, `Group`, `Model` and `SubComponent` by default and can be extended via USD startup scripts. - Shader Assignment : When selecting, the first ancestor location with a renderable and direct (not inherited) shader attribute will ultimately be selected. This can be used to select either surface or displacement shaders. +- Cycles : Added support for CUDA and Optix devices on Windows [^1]. Fixes ----- diff --git a/SConstruct b/SConstruct index d677019365a..a8495417b81 100644 --- a/SConstruct +++ b/SConstruct @@ -1360,7 +1360,7 @@ libraries = { "LIBS" : [ "Gaffer", "GafferScene", "GafferDispatch", "GafferBindings", "GafferCycles", "IECoreScene", "cycles_session", "cycles_scene", "cycles_graph", "cycles_bvh", "cycles_device", "cycles_kernel", "cycles_kernel_osl", - "cycles_integrator", "cycles_util", "cycles_subd", "extern_sky", + "cycles_integrator", "cycles_util", "cycles_subd", "extern_sky", "extern_cuew", "OpenImageIO$OIIO_LIB_SUFFIX", "OpenImageIO_Util$OIIO_LIB_SUFFIX", "oslexec$OSL_LIB_SUFFIX", "openvdb$VDB_LIB_SUFFIX", "oslquery$OSL_LIB_SUFFIX", "Alembic", "osdCPU", "OpenColorIO$OCIO_LIB_SUFFIX", "embree4", "Iex", "openpgl", ], @@ -1503,11 +1503,16 @@ for library in ( "GafferUI", ) : if env["PLATFORM"] == "win32" : - for library in ( "Gaffer", ) : + for library in ( "Gaffer", "GafferCycles", ) : libraries[library].setdefault( "envAppends", {} ) libraries[library]["envAppends"].setdefault( "LIBS", [] ).extend( [ "Advapi32" ] ) + for library in ( "GafferCycles", ) : + + libraries[library].setdefault( "pythonEnvAppends", {} ) + libraries[library]["pythonEnvAppends"].setdefault( "LIBS", [] ).extend( [ "Advapi32" ] ) + else : libraries["GafferCycles"]["envAppends"]["LIBS"].extend( [ "dl" ] )