From 593c699b2a50213263e706d34753a9e25ac1a26f Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 23 Feb 2022 12:45:38 +1100 Subject: [PATCH] Fix T95962: Sapling Addon now broken because of license header Load the first non-blank, non-comment line so files with licenses are supported. --- add_curve_sapling/__init__.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/add_curve_sapling/__init__.py b/add_curve_sapling/__init__.py index 585bd50e..bead5ee7 100644 --- a/add_curve_sapling/__init__.py +++ b/add_curve_sapling/__init__.py @@ -182,7 +182,10 @@ class ImportData(Operator): f = open(os.path.join(getPresetpaths()[0], self.filename), 'r') except (FileNotFoundError, IOError): f = open(os.path.join(getPresetpaths()[1], self.filename), 'r') - settings = f.readline() + # Find the first non-comment, non-blank line, this must contain preset text (all on one line). + for settings in f: + if settings and (not settings.startswith("#")): + break f.close() # print(settings) settings = ast.literal_eval(settings) -- 2.11.4.GIT