From f2f5412c6fd8f42f80f3c09818b0ad22e9acc28a Mon Sep 17 00:00:00 2001 From: Murray Stevenson <50844517+murraystevenson@users.noreply.github.com> Date: Tue, 21 Jan 2025 11:13:14 -0800 Subject: [PATCH] Attribute metadata : Relocate `filteredLights` registration We now have a more consolidated registration of attribute metadata in standardAttributes.py, so relocate this isolated registration there. --- startup/GafferScene/standardAttributes.py | 1 + startup/GafferSceneUI/lightFilter.py | 40 ----------------------- 2 files changed, 1 insertion(+), 40 deletions(-) delete mode 100644 startup/GafferSceneUI/lightFilter.py diff --git a/startup/GafferScene/standardAttributes.py b/startup/GafferScene/standardAttributes.py index c33c43efd4c..54da2943749 100644 --- a/startup/GafferScene/standardAttributes.py +++ b/startup/GafferScene/standardAttributes.py @@ -166,6 +166,7 @@ contribute to illumination by default. """ ) +Gaffer.Metadata.registerValue( "attribute:filteredLights", "ui:scene:acceptsSetExpression", True ) Gaffer.Metadata.registerValue( "attribute:gaffer:automaticInstancing", "label", "Automatic Instancing" ) Gaffer.Metadata.registerValue( "attribute:gaffer:automaticInstancing", "defaultValue", IECore.BoolData( True ) ) diff --git a/startup/GafferSceneUI/lightFilter.py b/startup/GafferSceneUI/lightFilter.py deleted file mode 100644 index b83b32687b4..00000000000 --- a/startup/GafferSceneUI/lightFilter.py +++ /dev/null @@ -1,40 +0,0 @@ -########################################################################## -# -# Copyright (c) 2024, Cinesite VFX Ltd. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: -# -# * Redistributions of source code must retain the above -# copyright notice, this list of conditions and the following -# disclaimer. -# -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following -# disclaimer in the documentation and/or other materials provided with -# the distribution. -# -# * Neither the name of John Haddon nor the names of -# any other contributors to this software may be used to endorse or -# promote products derived from this software without specific prior -# written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS -# IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -########################################################################## - -import Gaffer -import GafferSceneUI - -Gaffer.Metadata.registerValue( "attribute:filteredLights", "ui:scene:acceptsSetExpression", True )