[Bf-blender-cvs] [68e514e3e2] app-templates: Rename app_template_utils -> bl_app_template_utils

[Campbell Barton]

Commit: 68e514e3e2456d852af693eeb5bb3d4f4054eca6
Author: Campbell Barton
Date:   Thu Mar 16 08:33:17 2017 +1100
Branches: app-templates
https://developer.blender.org/rB68e514e3e2456d852af693eeb5bb3d4f4054eca6

Rename app_template_utils -> bl_app_template_utils

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

R098	release/scripts/modules/app_template_utils.py	release/scripts/modules/bl_app_template_utils.py
M	release/scripts/modules/bpy/utils/__init__.py
M	source/blender/windowmanager/intern/wm_files.c

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

diff --git a/release/scripts/modules/app_template_utils.py b/release/scripts/modules/bl_app_template_utils.py
similarity index 98%
rename from release/scripts/modules/app_template_utils.py
rename to release/scripts/modules/bl_app_template_utils.py
index 11037b0c06..73f24c9061 100644
--- a/release/scripts/modules/app_template_utils.py
+++ b/release/scripts/modules/bl_app_template_utils.py
@@ -58,7 +58,6 @@ _modules = {}
 
 
 def _enable(template_id, *, handle_error=None):
-    print('Running enable!!!')
     import os
     import sys
     from bpy_restrict_state import RestrictBlend
@@ -208,7 +207,7 @@ def reset(*, reload_scripts=False):
     """
     template_id = _bpy.context.user_preferences.app_template
     if _bpy.app.debug_python:
-        print("app_template_utils.reset('%s')" % template_id)
+        print("bl_app_template_utils.reset('%s')" % template_id)
 
     if reload_scripts and False:
         # TODO, seems correct but reload fails
diff --git a/release/scripts/modules/bpy/utils/__init__.py b/release/scripts/modules/bpy/utils/__init__.py
index d216a12889..cd91f6a0ba 100644
--- a/release/scripts/modules/bpy/utils/__init__.py
+++ b/release/scripts/modules/bpy/utils/__init__.py
@@ -68,7 +68,7 @@ import os as _os
 import sys as _sys
 
 import addon_utils as _addon_utils
-import app_template_utils as _app_template_utils
+import bl_app_template_utils as _bl_app_template_utils
 
 _user_preferences = _bpy.context.user_preferences
 _script_module_dirs = "startup", "modules"
@@ -248,7 +248,7 @@ def load_scripts(reload_scripts=False, refresh_scripts=False):
                         test_register(mod)
 
     # load template (if set)
-    _app_template_utils.reset(reload_scripts=reload_scripts)
+    _bl_app_template_utils.reset(reload_scripts=reload_scripts)
 
     # deal with addons separately
     _initialize = getattr(_addon_utils, "_initialize", None)
diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
index 48f056f254..7e621184a4 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -484,7 +484,7 @@ static void wm_file_read_post(bContext *C, bool is_startup_file)
 	if (is_startup_file) {
 		/* possible python hasn't been initialized */
 		if (CTX_py_init_get(C)) {
-			BPY_execute_string(C, "__import__('app_template_utils').reset()");
+			BPY_execute_string(C, "__import__('bl_app_template_utils').reset()");
 
 			/* sync addons, these may have changed from the defaults */
 			BPY_execute_string(C, "__import__('addon_utils').reset_all()");