From 2246e5b59719500a8d15cdd17fa81c7c104ec28a Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Mon, 14 Jun 2010 03:53:45 +0000
Subject: [PATCH] update for changes in trunk
---
export_unreal_psk_psa.py | 8 ++++----
fracture/fracture_ops.py | 2 +-
import_images_as_planes.py | 8 ++++----
import_scene_dxf.py | 4 ++--
import_scene_mhx.py | 4 ++--
import_scene_unreal_psk.py | 4 ++--
io_anim_camera.py | 10 +++++-----
io_mesh_raw/__init__.py | 4 ++--
io_mesh_raw/export_raw.py | 8 ++++----
io_mesh_raw/import_raw.py | 4 ++--
io_mesh_stl/__init__.py | 12 ++++++------
space_view3d_spacebar_menu.py | 6 +++---
12 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/export_unreal_psk_psa.py b/export_unreal_psk_psa.py
index 0a02bcd97..34bcc9cd8 100644
--- a/export_unreal_psk_psa.py
+++ b/export_unreal_psk_psa.py
@@ -1466,7 +1466,7 @@ class ExportUDKAnimData(bpy.types.Operator):
# List of operator properties, the attributes will be assigned
# to the class instance from the operator settings before calling.
- path = StringProperty(name="File Path", description="File path used for exporting the PSA file", maxlen= 1024, default= "")
+ filepath = StringProperty(name="File Path", description="Filepath used for exporting the PSA file", maxlen= 1024, default= "")
use_setting = BoolProperty(name="No Options Yet", description="No Options Yet", default= True)
filename = StringProperty(name="filename", description="", maxlen= 1024, default= "")
directory = StringProperty(name="directory", description="", maxlen= 1024, default= "")
@@ -1489,7 +1489,7 @@ class ExportUDKAnimData(bpy.types.Operator):
else:
bpy.context.scene.unrealexportpsa = False
- write_data(self.properties.path, context, self.properties.use_setting)
+ write_data(self.properties.filepath, context, self.properties.use_setting)
self.report({'WARNING', 'INFO'}, exportmessage)
return {'FINISHED'}
@@ -1503,7 +1503,7 @@ def menu_func(self, context):
bpy.context.scene.unrealexportpsk = True
bpy.context.scene.unrealexportpsa = True
default_path = bpy.data.filepath.replace(".blend", ".psk")
- self.layout.operator ("export.udk_anim_data", text="Skeleton Mesh / Animation Data (.psk/.psa)").path = default_path
+ self.layout.operator("export.udk_anim_data", text="Skeleton Mesh / Animation Data (.psk/.psa)").filepath = default_path
class VIEW3D_PT_unrealtools_objectmode(bpy.types.Panel):
bl_space_type = "VIEW_3D"
@@ -1553,7 +1553,7 @@ class OBJECT_OT_UnrealExport(bpy.types.Operator):
__doc__ = "Select export setting for .psk/.psa or both."
def invoke(self, context, event):
- path = StringProperty(name="File Path", description="File path used for exporting the PSA file", maxlen= 1024, default= "")
+ filepath = StringProperty(name="File Path", description="Filepath used for exporting the PSA file", maxlen= 1024, default= "")
print("Init Export Script:")
if(int(bpy.context.scene.unrealexport_settings) == 0):
bpy.context.scene.unrealexportpsk = True
diff --git a/fracture/fracture_ops.py b/fracture/fracture_ops.py
index 1f4c9f07b..558c2292d 100644
--- a/fracture/fracture_ops.py
+++ b/fracture/fracture_ops.py
@@ -445,7 +445,7 @@ def import_object(obname):
#print('import_object: ' + opath)
bpy.ops.wm.link_append(
- path=opath,
+ filepath=opath,
filename=obname,
directory=dpath,
filemode=1,
diff --git a/import_images_as_planes.py b/import_images_as_planes.py
index 6d72fda19..3c22d5732 100644
--- a/import_images_as_planes.py
+++ b/import_images_as_planes.py
@@ -377,8 +377,8 @@ class ImportImagesAsPlanes(bpy.types.Operator):
" with the appropiate aspect ratio."
bl_options = {'REGISTER', 'UNDO'}
- path = StringProperty(name="File Path",
- description="File path used for importing the file",
+ filepath = StringProperty(name="File Path",
+ description="Filepath used for importing the file",
maxlen=1024,
default="")
filename = StringProperty(name="File Name",
@@ -460,10 +460,10 @@ class ImportImagesAsPlanes(bpy.types.Operator):
def execute(self, context):
# File Path
- path = self.properties.path
+ filepath = self.properties.filepath
filename = self.properties.filename
directory = self.properties.directory
- filePath = (path, filename, directory)
+ filePath = (filepath, filename, directory)
# General Options
fromDirectory = self.properties.fromDirectory
diff --git a/import_scene_dxf.py b/import_scene_dxf.py
index 8a847109f..5b2ef3396 100644
--- a/import_scene_dxf.py
+++ b/import_scene_dxf.py
@@ -2025,7 +2025,7 @@ class IMPORT_OT_autocad_dxf(bpy.types.Operator):
bl_space_type = "PROPERTIES"
bl_region_type = "WINDOW"
- path = StringProperty(name="File Path", description="File path used for importing the DXF file", maxlen= 1024, default= "")
+ filepath = StringProperty(name="File Path", description="Filepath used for importing the DXF file", maxlen= 1024, default= "")
merge = BoolProperty(name="Remove doubles", description="Merge coincident vertices", default=toggle&T_Merge)
mergeLimit = FloatProperty(name="Merge limit", description="Merge limit", default = theMergeLimit*1e4)
@@ -2051,7 +2051,7 @@ class IMPORT_OT_autocad_dxf(bpy.types.Operator):
theMergeLimit = self.properties.mergeLimit*1e-4
theCodec = self.properties.codec
- readAndBuildDxfFile(self.properties.path)
+ readAndBuildDxfFile(self.properties.filepath)
return {'FINISHED'}
def invoke(self, context, event):
diff --git a/import_scene_mhx.py b/import_scene_mhx.py
index 716b2cc58..b7d100f60 100644
--- a/import_scene_mhx.py
+++ b/import_scene_mhx.py
@@ -2097,7 +2097,7 @@ class IMPORT_OT_makehuman_mhx(bpy.types.Operator):
bl_space_type = "PROPERTIES"
bl_region_type = "WINDOW"
- path = StringProperty(name="File Path", description="File path used for importing the MHX file", maxlen= 1024, default= "")
+ filepath = StringProperty(name="File Path", description="Filepath used for importing the MHX file", maxlen= 1024, default= "")
#preset = BoolProperty(name="Use rig preset", description="Use rig preset (Classic/Gobo)?", default=True)
#presetRig = EnumProperty(name="Rig", description="Choose preset rig",
@@ -2128,7 +2128,7 @@ class IMPORT_OT_makehuman_mhx(bpy.types.Operator):
toggle = O_Mesh | O_Armature | O_Proxy | T_ArmIK | T_LegIK | O_Replace | O_Face | O_Shape | O_Symm | T_MHX
- readMhxFile(self.properties.path,
+ readMhxFile(self.properties.filepath,
(self.properties.footRig,
self.properties.fingerRig))
return {'FINISHED'}
diff --git a/import_scene_unreal_psk.py b/import_scene_unreal_psk.py
index 9681b6a76..9a2b289d0 100644
--- a/import_scene_unreal_psk.py
+++ b/import_scene_unreal_psk.py
@@ -570,10 +570,10 @@ class IMPORT_OT_psk(bpy.types.Operator):
# List of operator properties, the attributes will be assigned
# to the class instance from the operator settings before calling.
- path = StringProperty(name="File Path", description="File path used for importing the OBJ file", maxlen= 1024, default= "")
+ filepath = StringProperty(name="File Path", description="Filepath used for importing the OBJ file", maxlen= 1024, default= "")
def execute(self, context):
- getInputFilename(self.properties.path)
+ getInputFilename(self.properties.filepath)
return {'FINISHED'}
def invoke(self, context, event):
diff --git a/io_anim_camera.py b/io_anim_camera.py
index 3656852e3..07eeeb97b 100644
--- a/io_anim_camera.py
+++ b/io_anim_camera.py
@@ -33,12 +33,12 @@ bl_addon_info = {
import bpy
-def writeCameras(context, path, frame_start, frame_end, only_selected=False):
+def writeCameras(context, filepath, frame_start, frame_end, only_selected=False):
data_attrs = ['lens', 'shift_x', 'shift_y', 'dof_distance', 'clip_start', 'clip_end', 'draw_size']
obj_attrs = ['restrict_render']
- fw = open(path, 'w').write
+ fw = open(filepath, 'w').write
scene = bpy.context.scene
@@ -118,7 +118,7 @@ class CameraExporter(bpy.types.Operator):
bl_idname = "export_animation.cameras"
bl_label = "Export Camera & Markers"
- path = StringProperty(name="File Path", description="File path used for importing the RAW file", maxlen=1024, default="")
+ filepath = StringProperty(name="File Path", description="File path used for importing the RAW file", maxlen=1024, default="")
filename = StringProperty(name="File Name", description="Name of the file.")
directory = StringProperty(name="Directory", description="Directory of the file.")
@@ -132,7 +132,7 @@ class CameraExporter(bpy.types.Operator):
default=True)
def execute(self, context):
- writeCameras(context, self.properties.path, self.properties.frame_start, self.properties.frame_end, self.properties.only_selected)
+ writeCameras(context, self.properties.filepath, self.properties.frame_start, self.properties.frame_end, self.properties.only_selected)
return {'FINISHED'}
def invoke(self, context, event):
@@ -146,7 +146,7 @@ class CameraExporter(bpy.types.Operator):
def menu_export(self, context):
default_path = bpy.data.filepath.replace(".blend", ".py")
- self.layout.operator(CameraExporter.bl_idname, text="Cameras & Markers (.py)").path = default_path
+ self.layout.operator(CameraExporter.bl_idname, text="Cameras & Markers (.py)").filepath = default_path
def register():
diff --git a/io_mesh_raw/__init__.py b/io_mesh_raw/__init__.py
index 74b111766..cab63b040 100644
--- a/io_mesh_raw/__init__.py
+++ b/io_mesh_raw/__init__.py
@@ -34,13 +34,13 @@ import bpy
def menu_import(self, context):
from io_mesh_raw import import_raw
- self.layout.operator(import_raw.RawImporter.bl_idname, text="Raw Faces (.raw)").path = "*.raw"
+ self.layout.operator(import_raw.RawImporter.bl_idname, text="Raw Faces (.raw)").filepath = "*.raw"
def menu_export(self, context):
from io_mesh_raw import export_raw
default_path = bpy.data.filepath.replace(".blend", ".raw")
- self.layout.operator(export_raw.RawExporter.bl_idname, text="Raw Faces (.raw)").path = default_path
+ self.layout.operator(export_raw.RawExporter.bl_idname, text="Raw Faces (.raw)").filepath = default_path
def register():
diff --git a/io_mesh_raw/export_raw.py b/io_mesh_raw/export_raw.py
index e94e26bb6..f02171441 100644
--- a/io_mesh_raw/export_raw.py
+++ b/io_mesh_raw/export_raw.py
@@ -61,7 +61,7 @@ def faceToLine(face):
return line[:-1] + "\n"
-def export_raw(path, applyMods, triangulate):
+def export_raw(filepath, applyMods, triangulate):
faces = []
for obj in bpy.context.selected_objects:
if obj.type == 'MESH':
@@ -80,7 +80,7 @@ def export_raw(path, applyMods, triangulate):
faces.append(fv)
# write the faces to a file
- file = open(path, "w")
+ file = open(filepath, "w")
for face in faces:
file.write(faceToLine(face))
file.close()
@@ -94,7 +94,7 @@ class RawExporter(bpy.types.Operator):
bl_idname = "export_mesh.raw"
bl_label = "Export RAW"
- path = StringProperty(name="File Path", description="File path used for exporting the RAW file", maxlen= 1024, default= "")
+ filepath = StringProperty(name="File Path", description="Filepath used for exporting the RAW file", maxlen= 1024, default= "")
filename = StringProperty(name="File Name", description="Name of the file.")
directory = StringProperty(name="Directory", description="Directory of the file.")
check_existing = BoolProperty(name="Check Existing", description="Check and warn on overwriting existing files", default=True, options={'HIDDEN'})
@@ -103,7 +103,7 @@ class RawExporter(bpy.types.Operator):
triangulate = BoolProperty(name="Triangulate", description="Triangulate quads.", default=True)
def execute(self, context):
- export_raw(self.properties.path, self.properties.apply_modifiers, self.properties.triangulate)
+ export_raw(self.properties.filepath, self.properties.apply_modifiers, self.properties.triangulate)
return {'FINISHED'}
def invoke(self, context, event):
diff --git a/io_mesh_raw/import_raw.py b/io_mesh_raw/import_raw.py
index e4bbf6edd..96b0c653a 100644
--- a/io_mesh_raw/import_raw.py
+++ b/io_mesh_raw/import_raw.py
@@ -119,7 +119,7 @@ class RawImporter(bpy.types.Operator):
bl_idname = "import_mesh.raw"
bl_label = "Import RAW"
- path = StringProperty(name="File Path", description="File path used for importing the RAW file", maxlen=1024, default="")
+ filepath = StringProperty(name="File Path", description="Filepath used for importing the RAW file", maxlen=1024, default="")
filename = StringProperty(name="File Name", description="Name of the file.")
directory = StringProperty(name="Directory", description="Directory of the file.")
@@ -128,7 +128,7 @@ class RawImporter(bpy.types.Operator):
#convert the filename to an object name
objName = bpy.utils.display_name(self.properties.filename)
- mesh = readMesh(self.properties.path, objName)
+ mesh = readMesh(self.properties.filepath, objName)
addMeshObj(mesh, objName)
return {'FINISHED'}
diff --git a/io_mesh_stl/__init__.py b/io_mesh_stl/__init__.py
index 38ef0535b..b80a971eb 100644
--- a/io_mesh_stl/__init__.py
+++ b/io_mesh_stl/__init__.py
@@ -57,7 +57,7 @@ class StlImporter(bpy.types.Operator):
bl_idname = "import_mesh.stl"
bl_label = "Import STL"
- path = StringProperty(name="File Path",
+ filepath = StringProperty(name="File Path",
description="File path used for importing "
"the STL file",
maxlen=1024,
@@ -69,7 +69,7 @@ class StlImporter(bpy.types.Operator):
def execute(self, context):
objName = bpy.utils.display_name(self.properties.filename)
- tris, pts = stl_utils.read_stl(self.properties.path)
+ tris, pts = stl_utils.read_stl(self.properties.filepath)
blender_utils.create_and_link_mesh(objName, tris, pts)
@@ -89,7 +89,7 @@ class StlExporter(bpy.types.Operator):
bl_idname = "export_mesh.stl"
bl_label = "Export STL"
- path = StringProperty(name="File Path",
+ filepath = StringProperty(name="File Path",
description="File path used for exporting "
"the active object to STL file",
maxlen=1024,
@@ -117,7 +117,7 @@ class StlExporter(bpy.types.Operator):
faces = blender_utils.faces_from_mesh(ob,
self.properties.apply_modifiers)
- stl_utils.write_stl(self.properties.path, faces, self.properties.ascii)
+ stl_utils.write_stl(self.properties.filepath, faces, self.properties.ascii)
return {'FINISHED'}
@@ -129,13 +129,13 @@ class StlExporter(bpy.types.Operator):
def menu_import(self, context):
self.layout.operator(StlImporter.bl_idname,
- text="Stl (.stl)").path = "*.stl"
+ text="Stl (.stl)").filepath = "*.stl"
def menu_export(self, context):
default_path = bpy.data.filepath.replace(".blend", ".stl")
self.layout.operator(StlExporter.bl_idname,
- text="Stl (.stl)").path = default_path
+ text="Stl (.stl)").filepath = default_path
def register():
diff --git a/space_view3d_spacebar_menu.py b/space_view3d_spacebar_menu.py
index 2a21bc6f7..932aa73a9 100644
--- a/space_view3d_spacebar_menu.py
+++ b/space_view3d_spacebar_menu.py
@@ -1087,19 +1087,19 @@ class VIEW3D_MT_edit_TK(bpy.types.Menu):
prop = layout.operator("wm.context_set_value",
text="Select By Vertex", icon='VERTEXSEL')
prop.value = "(True, False, False)"
- prop.path = "tool_settings.mesh_selection_mode"
+ prop.data_path = "tool_settings.mesh_selection_mode"
layout.menu("VIEW3D_MT_edit_mesh_vertices", icon='VERTEXSEL')
prop = layout.operator("wm.context_set_value",
text="Select By Edge", icon='EDGESEL')
prop.value = "(False, True, False)"
- prop.path = "tool_settings.mesh_selection_mode"
+ prop.data_path = "tool_settings.mesh_selection_mode"
layout.menu("VIEW3D_MT_edit_mesh_edges", icon='EDGESEL')
prop = layout.operator("wm.context_set_value",
text="Select By Face", icon='FACESEL')
prop.value = "(False, False, True)"
- prop.path = "tool_settings.mesh_selection_mode"
+ prop.data_path = "tool_settings.mesh_selection_mode"
layout.menu("VIEW3D_MT_edit_mesh_faces", icon='FACESEL')
layout.separator()
--
GitLab