[Bf-blender-cvs] [01212587705] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: 0121258770584b495964f5ba241bdead2018eb22
Author: Campbell Barton
Date:   Sat Nov 10 10:57:35 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB0121258770584b495964f5ba241bdead2018eb22

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/windowmanager/intern/wm_files.c
index 60d64e6ea5b,ef951010ba5..318147e8c25
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@@ -497,13 -470,17 +497,17 @@@ static void wm_file_read_post(bContext 
  	if (is_startup_file) {
  		/* possible python hasn't been initialized */
  		if (CTX_py_init_get(C)) {
 -			if (use_userdef) {
 +			if (reset_app_template) {
  				/* Only run when we have a template path found. */
  				if (BKE_appdir_app_template_any()) {
- 					BPY_execute_string(C, "__import__('bl_app_template_utils').reset()");
+ 					BPY_execute_string(
+ 					        C, (const char *[]){"bl_app_template_utils", NULL},
+ 					        "bl_app_template_utils.reset()");
  				}
  				/* sync addons, these may have changed from the defaults */
- 				BPY_execute_string(C, "__import__('addon_utils').reset_all()");
+ 				BPY_execute_string(
+ 				        C, (const char *[]){"addon_utils", NULL},
+ 				        "addon_utils.reset_all()");
  			}
  			BPY_python_reset(C);
  			addons_loaded = true;