From 948a12fa7157762e373a0f543f689123835e9987 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 8 Aug 2010 13:49:30 +0000 Subject: 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 --- add_mesh_BoltFactory/createMesh.py | 20 +++++++++++++++++++- add_mesh_BoltFactory/preset_utils.py | 6 +++--- 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) -- cgit v1.2.3