From 3dae64dbc3d6e3ae22a67205078d6b7682094ec8 Mon Sep 17 00:00:00 2001 From: Alex Fuller Date: Sun, 29 Mar 2020 14:01:59 -0700 Subject: [PATCH] Preprocessor doesn't like greater-equal, so making it just greater test --- include/GafferCycles/CyclesLight.h | 2 +- src/GafferCycles/CyclesLight.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/GafferCycles/CyclesLight.h b/include/GafferCycles/CyclesLight.h index b565020..600d5a3 100644 --- a/include/GafferCycles/CyclesLight.h +++ b/include/GafferCycles/CyclesLight.h @@ -61,7 +61,7 @@ class GAFFERCYCLES_API CyclesLight : public GafferScene::Light protected : void hashLight( const Gaffer::Context *context, IECore::MurmurHash &h ) const override; -#ifdef GAFFER_MAJOR_VERSION >= 56 +#ifdef GAFFER_MAJOR_VERSION > 55 IECoreScene::ConstShaderNetworkPtr computeLight( const Gaffer::Context *context ) const override; #else IECoreScene::ShaderNetworkPtr computeLight( const Gaffer::Context *context ) const override; diff --git a/src/GafferCycles/CyclesLight.cpp b/src/GafferCycles/CyclesLight.cpp index b2f4599..3a19d9b 100644 --- a/src/GafferCycles/CyclesLight.cpp +++ b/src/GafferCycles/CyclesLight.cpp @@ -102,7 +102,7 @@ void CyclesLight::hashLight( const Gaffer::Context *context, IECore::MurmurHash shaderNamePlug()->hash( h ); } -#ifdef GAFFER_MAJOR_VERSION >= 56 +#ifdef GAFFER_MAJOR_VERSION > 55 IECoreScene::ConstShaderNetworkPtr CyclesLight::computeLight( const Gaffer::Context *context ) const #else IECoreScene::ShaderNetworkPtr CyclesLight::computeLight( const Gaffer::Context *context ) const