GafferCycles : Refactored python bindings

Changes.md

@@ -7,6 +7,9 @@ Improvements
 - LightEditor : Values of inherited attributes are now displayed in the Light Editor. These are presented as dimmed "fallback" values.
 - LightEditor, RenderPassEditor : Fallback values shown in the history window are displayed with the same dimmed text colour used for fallback values in editor columns.
 - EditScope : Filtered the EditScope menu to show only nodes that are active in the relevant context.
+- GafferCycles :
+  - Refactored the python module so that the data needed for binding is all located in IECoreCycles and not dependent on linking with Cycles itself for that data.
+  - Added `majorVersion` `minorVersion` `patchVersion` and `version` to the python module to easily query the running Cycles version
 
 Fixes
 -----

SConstruct

@@ -1361,13 +1361,8 @@ libraries = {
 			"FRAMEWORKS" : [ "Foundation", "Metal", "IOKit" ],
 		},
 		"pythonEnvAppends" : {
-			"LIBPATH" : [ "$CYCLES_ROOT/lib" ],
 			"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", "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",
 			],
 			"CXXFLAGS" : [ systemIncludeArgument, "$CYCLES_ROOT/include" ],
 			"CPPDEFINES" : cyclesDefines,

include/GafferCycles/IECoreCyclesPreview/IECoreCycles.h

@@ -36,10 +36,7 @@
 
 #include "GafferCycles/IECoreCyclesPreview/Export.h"
 
-// Cycles
-IECORE_PUSH_DEFAULT_VISIBILITY
-#include "device/device.h"
-IECORE_POP_DEFAULT_VISIBILITY
+#include "IECore/CompoundData.h"
 
 #include <string>
 
@@ -64,4 +61,19 @@ IECORECYCLES_API int patchVersion();
 /// Returns a string of the form "major.minor.patch"
 IECORECYCLES_API const std::string &versionString();
 
+/// Returns all device data (for python bindings)
+IECORECYCLES_API const IECore::CompoundData *devices();
+/// Returns all node data (for python bindings)
+IECORECYCLES_API const IECore::CompoundData *nodes();
+/// Returns all shader data (for python bindings)
+IECORECYCLES_API const IECore::CompoundData *shaders();
+/// Returns all light data (for python bindings)
+IECORECYCLES_API const IECore::CompoundData *lights();
+/// Returns all pass data (for python bindings)
+IECORECYCLES_API const IECore::CompoundData *passes();
+/// Returns if OpenImageDenoise has been compiled in Cycles
+IECORECYCLES_API bool openImageDenoiseSupported();
+/// Returns if OptixDenoise has been compiled in Cycles
+IECORECYCLES_API bool optixDenoiseSupported();
+
 }