From 52b1c3764595c87506d1a164c46bf83773549cd6 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 9 Feb 2010 19:22:57 +0000 Subject: [#21039] OBJ import Clamp Scale limited to .01 as lowest Value. Used to be Zero [#21053] 2.5alpha0 export obj problem + some minor changes. --- release/scripts/io/export_obj.py | 6 +++++- release/scripts/io/import_scene_obj.py | 2 +- release/scripts/ui/space_view3d_toolbar.py | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) (limited to 'release') diff --git a/release/scripts/io/export_obj.py b/release/scripts/io/export_obj.py index 81af5d3551d..95532868e6d 100644 --- a/release/scripts/io/export_obj.py +++ b/release/scripts/io/export_obj.py @@ -928,7 +928,11 @@ class ExportOBJ(bpy.types.Operator): def execute(self, context): - do_export(self.properties.path, context, + path = self.properties.path + if not path.lower().endswith(".obj"): + path += ".obj" + + do_export(path, context, EXPORT_TRI=self.properties.use_triangles, EXPORT_EDGES=self.properties.use_edges, EXPORT_NORMALS=self.properties.use_normals, diff --git a/release/scripts/io/import_scene_obj.py b/release/scripts/io/import_scene_obj.py index c703a9789bf..df598835677 100644 --- a/release/scripts/io/import_scene_obj.py +++ b/release/scripts/io/import_scene_obj.py @@ -1594,7 +1594,7 @@ class IMPORT_OT_obj(bpy.types.Operator): # disabled this option because in old code a handler for it disabled SPLIT* params, it's not passed to load_obj # KEEP_VERT_ORDER = BoolProperty(name="Keep Vert Order", description="Keep vert and face order, disables split options, enable for morph targets", default= True) ROTATE_X90 = BoolProperty(name="-X90", description="Rotate X 90.", default= True) - CLAMP_SIZE = FloatProperty(name="Clamp Scale", description="Clamp the size to this maximum (Zero to Disable)", min=0.01, max=1000.0, soft_min=0.0, soft_max=1000.0, default=0.0) + CLAMP_SIZE = FloatProperty(name="Clamp Scale", description="Clamp the size to this maximum (Zero to Disable)", min=0.0, max=1000.0, soft_min=0.0, soft_max=1000.0, default=0.0) POLYGROUPS = BoolProperty(name="Poly Groups", description="Import OBJ groups as vertex groups.", default= True) IMAGE_SEARCH = BoolProperty(name="Image Search", description="Search subdirs for any assosiated images (Warning, may be slow)", default= True) diff --git a/release/scripts/ui/space_view3d_toolbar.py b/release/scripts/ui/space_view3d_toolbar.py index fddce61c7cf..9924ea1cad2 100644 --- a/release/scripts/ui/space_view3d_toolbar.py +++ b/release/scripts/ui/space_view3d_toolbar.py @@ -897,7 +897,7 @@ class VIEW3D_PT_tools_projectpaint(View3DPanel): row = sub.row() row.active = (settings.brush.imagepaint_tool == 'CLONE') - row.prop(ipaint, "use_clone_layer", text="Clone") + row.prop(ipaint, "use_clone_layer", text="Layer") row.menu("VIEW3D_MT_tools_projectpaint_clone", text=context.active_object.data.uv_texture_clone.name) sub = col.column() -- cgit v1.2.3