blender
/
blender
136
407
Fork 590
Code Issues 6.3k Pull Requests 779 Projects 19 Wiki Activity

Fix app-template warning disabling a template without a Python module

This commit is contained in:
Campbell Barton 2020-06-03 14:41:31 +10:00
parent f0df4d6c35
commit 3b6e223a03
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
release/scripts/modules/bl_app_template_utils.py
View File

@ -68,14 +68,15 @@ def _enable(template_id, *, handle_error=None, ignore_not_found=False):
# 1) try import
try:
mod = import_from_id(template_id, ignore_not_found=ignore_not_found)
if mod is None:
return None
mod.__template_enabled__ = False
_modules[template_id] = mod
except Exception as ex:
handle_error(ex)
return None
_modules[template_id] = mod
if mod is None:
return None
mod.__template_enabled__ = False
# 2) try run the modules register function
try:
mod.register()
@ -111,9 +112,12 @@ def _disable(template_id, *, handle_error=None):
import traceback
traceback.print_exc()
mod = _modules.get(template_id)
mod = _modules.get(template_id, False)
if mod and getattr(mod, "__template_enabled__", False) is not False:
if mod is None:
# Loaded but has no module, remove since there is no use in keeping it.
del _modules[template_id]
elif getattr(mod, "__template_enabled__", False) is not False:
mod.__template_enabled__ = False
try:
@ -124,7 +128,7 @@ def _disable(template_id, *, handle_error=None):
handle_error(ex)
else:
print("\tapp_template_utils.disable: %s not %s." %
(template_id, "disabled" if mod is None else "loaded"))
(template_id, "disabled" if mod is False else "loaded"))
if _bpy.app.debug_python:
print("\tapp_template_utils.disable", template_id)