archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

I18n utils: fix broken case when 'settings' argument is default NULL one.

Browse Source
This commit is contained in:
Bastien Montagne
2020-07-13 12:46:29 +02:00
parent 7453ff73ad
commit 0158571b34
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
release/scripts/modules/bl_i18n_utils/settings.py
View File

@@ -601,8 +601,11 @@ class I18nSettings:
return json.dumps(export_dict) return json.dumps(export_dict)
def load(self, fname, reset=False): def load(self, fname, reset=False):
reset = reset or fname is None
if reset: if reset:
self.__dict__ = {uid: data for uid, data in globals().items() if not uid.startswith("_")} self.__dict__ = {uid: data for uid, data in globals().items() if not uid.startswith("_")}
if fname is None:
return
if isinstance(fname, str): if isinstance(fname, str):
if not os.path.isfile(fname): if not os.path.isfile(fname):
# Assume it is already real JSon string... # Assume it is already real JSon string...