[Bf-blender-cvs] [62cf6f1eed] app-templates: Change path resolution order to match script resolution order

Campbell Barton noreply at git.blender.org
Fri Mar 24 00:08:09 CET 2017


Commit: 62cf6f1eed51c297d1ceda17cae11672e905f048
Author: Campbell Barton
Date:   Fri Mar 24 10:08:24 2017 +1100
Branches: app-templates
https://developer.blender.org/rB62cf6f1eed51c297d1ceda17cae11672e905f048

Change path resolution order to match script resolution order

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

M	source/blender/blenkernel/intern/appdir.c

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

diff --git a/source/blender/blenkernel/intern/appdir.c b/source/blender/blenkernel/intern/appdir.c
index 8438d582fd..f6d6cb1cac 100644
--- a/source/blender/blenkernel/intern/appdir.c
+++ b/source/blender/blenkernel/intern/appdir.c
@@ -656,13 +656,13 @@ bool BKE_appdir_program_python_search(
 }
 
 static const char *app_template_directory_search[2] = {
-	"startup" SEP_STR "bl_app_templates_system",
 	"startup" SEP_STR "bl_app_templates_user",
+	"startup" SEP_STR "bl_app_templates_system",
 };
 
 static const int app_template_directory_id[2] = {
-	BLENDER_SYSTEM_SCRIPTS,
 	BLENDER_USER_SCRIPTS,
+	BLENDER_SYSTEM_SCRIPTS,
 };
 
 /**




More information about the Bf-blender-cvs mailing list