[Bf-blender-cvs] [0158571b346] master: I18n utils: fix broken case when 'settings' argument is default NULL one.
Bastien Montagne
noreply at git.blender.org
Mon Jul 13 12:52:00 CEST 2020
Commit: 0158571b34693dae0f05b36a96e46d4685a1a03f
Author: Bastien Montagne
Date: Mon Jul 13 12:46:29 2020 +0200
Branches: master
https://developer.blender.org/rB0158571b34693dae0f05b36a96e46d4685a1a03f
I18n utils: fix broken case when 'settings' argument is default NULL one.
===================================================================
M release/scripts/modules/bl_i18n_utils/settings.py
===================================================================
diff --git a/release/scripts/modules/bl_i18n_utils/settings.py b/release/scripts/modules/bl_i18n_utils/settings.py
index e522ec3fcf9..a6101474aa9 100644
--- a/release/scripts/modules/bl_i18n_utils/settings.py
+++ b/release/scripts/modules/bl_i18n_utils/settings.py
@@ -601,8 +601,11 @@ class I18nSettings:
return json.dumps(export_dict)
def load(self, fname, reset=False):
+ reset = reset or fname is None
if reset:
self.__dict__ = {uid: data for uid, data in globals().items() if not uid.startswith("_")}
+ if fname is None:
+ return
if isinstance(fname, str):
if not os.path.isfile(fname):
# Assume it is already real JSon string...
More information about the Bf-blender-cvs
mailing list