[Bf-blender-cvs] [475573d829] app-templates: Disable template before addons

[Campbell Barton]

Commit: 475573d829ca71c594ff7949c11b202308f5ebae
Author: Campbell Barton
Date:   Tue Mar 21 06:41:53 2017 +1100
Branches: app-templates
https://developer.blender.org/rB475573d829ca71c594ff7949c11b202308f5ebae

Disable template before addons

So we don't attempt to disable addons twice

===================================================================

M	release/scripts/modules/bl_app_template_utils.py

===================================================================

diff --git a/release/scripts/modules/bl_app_template_utils.py b/release/scripts/modules/bl_app_template_utils.py
index cf98da52b2..148200dc1e 100644
--- a/release/scripts/modules/bl_app_template_utils.py
+++ b/release/scripts/modules/bl_app_template_utils.py
@@ -208,13 +208,13 @@ def activate(template_id=None):
         return
     """
 
+    if template_id_prev:
+        _disable(template_id_prev)
+
     # Disable all addons, afterwards caller must reset.
     import addon_utils
     addon_utils.disable_all()
 
-    if template_id_prev:
-        _disable(template_id_prev)
-
     # ignore_not_found so modules that don't contain scripts don't raise errors
     mod = _enable(template_id, ignore_not_found=True) if template_id else None