Merge branch 'Development' into node-groups

bnpr · Jul 6, 2024 · 00d4608 · 00d4608
2 parents 7dd08ef + 907b1c5
commit 00d4608
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/BlenderMalt/MaltProperties.py b/BlenderMalt/MaltProperties.py
@@ -349,7 +349,7 @@ def resize():
         for key, value in rna.items():
             if '@' in key and key not in parameters.keys():
                 main_name = key.split(' @ ')[0]
-                rna[key]['active'] = rna[main_name]['active'] and rna[key]['active']
+                rna[key]['active'] = main_name in rna.keys() and rna[main_name]['active'] and rna[key]['active']
                 if rna[key]['active']:
                     if rna[key]['type'] != rna[main_name]['type'] or rna[key]['size'] != rna[main_name]['size']:
                         parameter = Parameter(rna[main_name]['default'], rna[main_name]['type'],

diff --git a/Malt/Pipelines/NPR_Pipeline/Defaults/defaults.blend b/Malt/Pipelines/NPR_Pipeline/Defaults/defaults.blend