diff options
-rw-r--r-- | release/scripts/io/export_obj.py | 6 | ||||
-rw-r--r-- | release/scripts/io/import_scene_obj.py | 2 | ||||
-rw-r--r-- | release/scripts/ui/space_view3d_toolbar.py | 2 | ||||
-rw-r--r-- | source/blender/python/intern/bpy_rna.c | 12 |
4 files changed, 15 insertions, 7 deletions
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() diff --git a/source/blender/python/intern/bpy_rna.c b/source/blender/python/intern/bpy_rna.c index fde805f94ee..04d29d40ca6 100644 --- a/source/blender/python/intern/bpy_rna.c +++ b/source/blender/python/intern/bpy_rna.c @@ -2599,7 +2599,7 @@ PyObject *pyrna_prop_iter(BPy_PropertyRNA *self) { /* Try get values from a collection */ PyObject *ret; - PyObject *iter; + PyObject *iter= NULL; if(RNA_property_array_check(&self->ptr, self->prop)) { int len= pyrna_prop_array_length(self); @@ -2614,9 +2614,13 @@ PyObject *pyrna_prop_iter(BPy_PropertyRNA *self) } - /* we know this is a list so no need to PyIter_Check */ - iter = PyObject_GetIter(ret); - Py_DECREF(ret); + /* we know this is a list so no need to PyIter_Check + * otherwise it could be NULL (unlikely) if conversion failed */ + if(ret) { + iter = PyObject_GetIter(ret); + Py_DECREF(ret); + } + return iter; } |