Fix a couple of typos with the

light linking editor. Also, we need to reset the lighting exclude subset to an empty string , if there is no exclude subset.
prman-pixar · Jun 17, 2021 · e5d2a0c · e5d2a0c
1 parent 4fbbfd3
commit e5d2a0c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 1 deletion.
diff --git a/rman_operators/rman_operators_collections.py b/rman_operators/rman_operators_collections.py
@@ -481,7 +481,7 @@ def execute(self, context):
                 ll.members.remove(i)
                 ll.members_index -= 1
                 grp = ob.renderman.rman_lighting_excludesubset
-                light_props = shadergraph_utils.get_rman_light_properties_group(self.light_ob)
+                light_props = shadergraph_utils.get_rman_light_properties_group(ll.light_ob)
                 if light_props.renderman_light_role == 'RMAN_LIGHTFILTER':
                     grp = ob.renderman.rman_lightfilter_subset
                 for j, subset in enumerate(grp):

diff --git a/rman_properties/rman_properties_misc/__init__.py b/rman_properties/rman_properties_misc/__init__.py
@@ -27,6 +27,8 @@ def update_name(self, context):
             member.light_ob.update_tag(refresh={'DATA'})
 
     def update_members_index(self, context):
+        if self.members_index < 0:
+            return        
         member = self.members[self.members_index]
         light_ob = member.light_ob
 
@@ -59,6 +61,8 @@ def update_name(self, context):
             member.ob_pointer.update_tag(refresh={'OBJECT'})
 
     def update_members_index(self, context):
+        if self.members_index < 0:
+            return        
         member = self.members[self.members_index]
         ob = member.ob_pointer
 
@@ -103,6 +107,8 @@ def validate_light_obj(self, ob):
                                  name='Group Members')    
 
     def update_members_index(self, context):
+        if self.members_index < 0:
+            return
         member = self.members[self.members_index]
         ob = member.ob_pointer
 

diff --git a/rman_translators/rman_translator.py b/rman_translators/rman_translator.py
@@ -182,9 +182,13 @@ def export_object_attributes(self, ob, rman_sg_node):
 
         if exclude_subset:
             attrs.SetString(self.rman_scene.rman.Tokens.Rix.k_lighting_excludesubset, ' '. join(exclude_subset) )
+        else:
+            attrs.SetString(self.rman_scene.rman.Tokens.Rix.k_lighting_excludesubset, '')
 
         if lightfilter_subset:
             attrs.SetString(self.rman_scene.rman.Tokens.Rix.k_lightfilter_subset, ' ' . join(lightfilter_subset))
+        else:
+            attrs.SetString(self.rman_scene.rman.Tokens.Rix.k_lightfilter_subset, '')
 
         if hasattr(ob, 'color'):
             attrs.SetColor('user:Cs', ob.color[:3])