Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender-addons.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2010-08-08 17:49:30 +0400
committerCampbell Barton <ideasman42@gmail.com>2010-08-08 17:49:30 +0400
commit948a12fa7157762e373a0f543f689123835e9987 (patch)
tree8f8d3ca81eb7c4195b1ab63a69520c1d44f72332 /add_mesh_BoltFactory
parent4fd834ee5ee5dd6a1a3cc56e451ef01d23dd001d (diff)
removed header from these files by mistake when testing some other problem.
this commit also makes a minor change with path joinin in preset_utils.py
Diffstat (limited to 'add_mesh_BoltFactory')
-rw-r--r--add_mesh_BoltFactory/createMesh.py20
-rw-r--r--add_mesh_BoltFactory/preset_utils.py6
2 files changed, 22 insertions, 4 deletions
diff --git a/add_mesh_BoltFactory/createMesh.py b/add_mesh_BoltFactory/createMesh.py
index a41e6994..278d4ee2 100644
--- a/add_mesh_BoltFactory/createMesh.py
+++ b/add_mesh_BoltFactory/createMesh.py
@@ -1,4 +1,22 @@
-import os #remove this
+# ##### BEGIN GPL LICENSE BLOCK #####
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# ##### END GPL LICENSE BLOCK #####
+
+import os #remove this
import bpy
try:
diff --git a/add_mesh_BoltFactory/preset_utils.py b/add_mesh_BoltFactory/preset_utils.py
index 82becf87..d477b94a 100644
--- a/add_mesh_BoltFactory/preset_utils.py
+++ b/add_mesh_BoltFactory/preset_utils.py
@@ -23,8 +23,8 @@ import os, sys
def getPresets():
- scriptPath = bpy.utils.script_paths()[0] + os.sep + "addons" + os.sep + "add_mesh_BoltFactory"
- presetPath = scriptPath + os.sep + "presets"
+ scriptPath = os.path.join(bpy.utils.script_paths()[0], "addons" , "add_mesh_BoltFactory")
+ presetPath = os.path.join(scriptPath, "presets")
presetFiles = os.listdir(presetPath)
#presetFiles.sort()
@@ -43,7 +43,7 @@ def setProps(props, preset, presetsPath):
#bpy.ops.script.python_file_run(filepath=presetsPath + '\\' + preset)
- file = open(presetsPath + os.sep + preset)
+ file = open(os.path.join(presetsPath, preset))
for line in file:
exec(line)