[Bf-blender-cvs] [103d9764c8] app-templates: Move app_templates into data-files

Campbell Barton noreply at git.blender.org
Thu Mar 16 16:24:33 CET 2017


Commit: 103d9764c8beccdf1da03de02eb4eb8ac0ca0cc3
Author: Campbell Barton
Date:   Fri Mar 17 02:29:33 2017 +1100
Branches: app-templates
https://developer.blender.org/rB103d9764c8beccdf1da03de02eb4eb8ac0ca0cc3

Move app_templates into data-files

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

R100	release/app_templates/101/startup.blend	release/datafiles/app_templates/101/startup.blend
R100	release/app_templates/101/template/__init__.py	release/datafiles/app_templates/101/template/__init__.py
R100	release/app_templates/3d_print/startup.blend	release/datafiles/app_templates/3d_print/startup.blend
R100	release/app_templates/3d_print/template/__init__.py	release/datafiles/app_templates/3d_print/template/__init__.py
R100	release/app_templates/lighting/startup.blend	release/datafiles/app_templates/lighting/startup.blend
R100	release/app_templates/lighting/template/__init__.py	release/datafiles/app_templates/lighting/template/__init__.py
M	release/scripts/modules/bpy/utils/__init__.py

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

diff --git a/release/app_templates/101/startup.blend b/release/datafiles/app_templates/101/startup.blend
similarity index 100%
rename from release/app_templates/101/startup.blend
rename to release/datafiles/app_templates/101/startup.blend
diff --git a/release/app_templates/101/template/__init__.py b/release/datafiles/app_templates/101/template/__init__.py
similarity index 100%
rename from release/app_templates/101/template/__init__.py
rename to release/datafiles/app_templates/101/template/__init__.py
diff --git a/release/app_templates/3d_print/startup.blend b/release/datafiles/app_templates/3d_print/startup.blend
similarity index 100%
rename from release/app_templates/3d_print/startup.blend
rename to release/datafiles/app_templates/3d_print/startup.blend
diff --git a/release/app_templates/3d_print/template/__init__.py b/release/datafiles/app_templates/3d_print/template/__init__.py
similarity index 100%
rename from release/app_templates/3d_print/template/__init__.py
rename to release/datafiles/app_templates/3d_print/template/__init__.py
diff --git a/release/app_templates/lighting/startup.blend b/release/datafiles/app_templates/lighting/startup.blend
similarity index 100%
rename from release/app_templates/lighting/startup.blend
rename to release/datafiles/app_templates/lighting/startup.blend
diff --git a/release/app_templates/lighting/template/__init__.py b/release/datafiles/app_templates/lighting/template/__init__.py
similarity index 100%
rename from release/app_templates/lighting/template/__init__.py
rename to release/datafiles/app_templates/lighting/template/__init__.py
diff --git a/release/scripts/modules/bpy/utils/__init__.py b/release/scripts/modules/bpy/utils/__init__.py
index cd91f6a0ba..e512dbe0f5 100644
--- a/release/scripts/modules/bpy/utils/__init__.py
+++ b/release/scripts/modules/bpy/utils/__init__.py
@@ -375,7 +375,7 @@ def app_template_paths(subdir=None):
     """
     # All possible paths, no duplicates, keep order.
     base_paths = (
-        path for path in (_os.path.join(resource_path(res), "app_templates")
+        path for path in (_os.path.join(resource_path(res), "datafiles", "app_templates")
         for res in ('LOCAL', 'USER', 'SYSTEM')))
 
     templates = []




More information about the Bf-blender-cvs mailing list