[Bf-extensions-cvs] [593c699b] master: Fix T95962: Sapling Addon now broken because of license header
Campbell Barton
noreply at git.blender.org
Wed Feb 23 02:46:26 CET 2022
Commit: 593c699b2a50213263e706d34753a9e25ac1a26f
Author: Campbell Barton
Date: Wed Feb 23 12:45:38 2022 +1100
Branches: master
https://developer.blender.org/rBA593c699b2a50213263e706d34753a9e25ac1a26f
Fix T95962: Sapling Addon now broken because of license header
Load the first non-blank, non-comment line so files with licenses
are supported.
===================================================================
M add_curve_sapling/__init__.py
===================================================================
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)
More information about the Bf-extensions-cvs
mailing list