diff --git a/io_mesh_ply/__init__.py b/io_mesh_ply/__init__.py index 6672dae45fc404fad75a973dc8ab2205c56add9d..92b0bbdd0f010113f9a5392316b5c55db1ed347b 100644 --- a/io_mesh_ply/__init__.py +++ b/io_mesh_ply/__init__.py @@ -89,7 +89,7 @@ class ExportPLY(bpy.types.Operator, ExportHelper): filename_ext = ".ply" filter_glob = StringProperty(default="*.ply", options={'HIDDEN'}) - use_modifiers = BoolProperty( + use_mesh_modifiers = BoolProperty( name="Apply Modifiers", description="Apply Modifiers to the exported mesh", default=True, @@ -127,7 +127,7 @@ class ExportPLY(bpy.types.Operator, ExportHelper): layout = self.layout row = layout.row() - row.prop(self, "use_modifiers") + row.prop(self, "use_mesh_modifiers") row.prop(self, "use_normals") row = layout.row() row.prop(self, "use_uv_coords") diff --git a/io_mesh_ply/export_ply.py b/io_mesh_ply/export_ply.py index 4e67b0c94f9b43b0e2b8dba9118dd134ded15152..5b4668182693f8ed043e4869dbeca3520554b214 100644 --- a/io_mesh_ply/export_ply.py +++ b/io_mesh_ply/export_ply.py @@ -31,7 +31,7 @@ import os def save(operator, context, filepath="", - use_modifiers=True, + use_mesh_modifiers=True, use_normals=True, use_uv_coords=True, use_colors=True, @@ -55,7 +55,7 @@ def save(operator, if scene.objects.active: bpy.ops.object.mode_set(mode='OBJECT') - if use_modifiers: + if use_mesh_modifiers: mesh = obj.to_mesh(scene, True, 'PREVIEW') else: mesh = obj.data @@ -200,7 +200,7 @@ def save(operator, file.close() print("writing %r done" % filepath) - if use_modifiers: + if use_mesh_modifiers: bpy.data.meshes.remove(mesh) # XXX diff --git a/io_mesh_stl/__init__.py b/io_mesh_stl/__init__.py index 34c586a34e96410a5445c04fbda5865c0b156047..cb0badc5f6862cacdcf31f4cdca07326b0886abe 100644 --- a/io_mesh_stl/__init__.py +++ b/io_mesh_stl/__init__.py @@ -115,13 +115,16 @@ class ExportSTL(Operator, ExportHelper): filename_ext = ".stl" filter_glob = StringProperty(default="*.stl", options={'HIDDEN'}) - ascii = BoolProperty(name="Ascii", - description="Save the file in ASCII file format", - default=False) - apply_modifiers = BoolProperty(name="Apply Modifiers", - description="Apply the modifiers " - "before saving", - default=True) + ascii = BoolProperty( + name="Ascii", + description="Save the file in ASCII file format", + default=False, + ) + use_mesh_modifiers = BoolProperty( + name="Apply Modifiers", + description="Apply the modifiers before saving", + default=True, + ) def execute(self, context): from . import stl_utils @@ -129,7 +132,7 @@ class ExportSTL(Operator, ExportHelper): import itertools faces = itertools.chain.from_iterable( - blender_utils.faces_from_mesh(ob, self.apply_modifiers) + blender_utils.faces_from_mesh(ob, self.use_mesh_modifiers) for ob in context.selected_objects) stl_utils.write_stl(self.filepath, faces, self.ascii) diff --git a/io_mesh_stl/blender_utils.py b/io_mesh_stl/blender_utils.py index 1d24369e456391d8e974f66989d2f737f8bca5b7..5589da4e5584161bfe42adb9425ed7b43a7a283d 100644 --- a/io_mesh_stl/blender_utils.py +++ b/io_mesh_stl/blender_utils.py @@ -41,14 +41,14 @@ def create_and_link_mesh(name, faces, points): obj.select = True -def faces_from_mesh(ob, apply_modifier=False, triangulate=True): +def faces_from_mesh(ob, use_mesh_modifiers=False, triangulate=True): """ From an object, return a generator over a list of faces. Each faces is a list of his vertexes. Each vertex is a tuple of his coordinate. - apply_modifier + use_mesh_modifiers Apply the preview modifier to the returned liste triangulate @@ -57,7 +57,7 @@ def faces_from_mesh(ob, apply_modifier=False, triangulate=True): # get the modifiers try: - mesh = ob.to_mesh(bpy.context.scene, apply_modifier, "PREVIEW") + mesh = ob.to_mesh(bpy.context.scene, use_mesh_modifiers, "PREVIEW") except RuntimeError: raise StopIteration diff --git a/io_scene_obj/__init__.py b/io_scene_obj/__init__.py index 501dc4b8a5c69d67ec8e12a685b99aa7bbd8e177..a2b97bff9876256aa11778f57d1b89a32c2c31be 100644 --- a/io_scene_obj/__init__.py +++ b/io_scene_obj/__init__.py @@ -221,7 +221,7 @@ class ExportOBJ(bpy.types.Operator, ExportHelper): ) # object group - use_apply_modifiers = BoolProperty( + use_mesh_modifiers = BoolProperty( name="Apply Modifiers", description="Apply modifiers (preview resolution)", default=True, diff --git a/io_scene_obj/export_obj.py b/io_scene_obj/export_obj.py index a0926cc47f3f1b1216be237998966014dfc4d5d3..fed389c6199c1f61aaac23928927d4a1859dc4a0 100644 --- a/io_scene_obj/export_obj.py +++ b/io_scene_obj/export_obj.py @@ -732,7 +732,7 @@ def save(operator, context, filepath="", use_normals=False, use_uvs=True, use_materials=True, - use_apply_modifiers=True, + use_mesh_modifiers=True, use_blen_objects=True, group_by_object=False, group_by_material=False, @@ -751,7 +751,7 @@ def save(operator, context, filepath="", EXPORT_NORMALS=use_normals, EXPORT_UV=use_uvs, EXPORT_MTL=use_materials, - EXPORT_APPLY_MODIFIERS=use_apply_modifiers, + EXPORT_APPLY_MODIFIERS=use_mesh_modifiers, EXPORT_BLEN_OBS=use_blen_objects, EXPORT_GROUP_BY_OB=group_by_object, EXPORT_GROUP_BY_MAT=group_by_material, diff --git a/io_scene_x3d/__init__.py b/io_scene_x3d/__init__.py index 1440684b546b39ee442c35176ffe6dc84de654ef..6bf640171d0fb0e6c52a261245362d058ccf6cd6 100644 --- a/io_scene_x3d/__init__.py +++ b/io_scene_x3d/__init__.py @@ -109,7 +109,7 @@ class ExportX3D(bpy.types.Operator, ExportHelper): description="Export selected objects only", default=False, ) - use_apply_modifiers = BoolProperty( + use_mesh_modifiers = BoolProperty( name="Apply Modifiers", description="Use transformed mesh data from each object", default=True, diff --git a/io_scene_x3d/export_x3d.py b/io_scene_x3d/export_x3d.py index 703213053d4f34f79ef47a6c869bd31a57808a70..477e6c2b36c944b3992db401b293722829e3e260 100644 --- a/io_scene_x3d/export_x3d.py +++ b/io_scene_x3d/export_x3d.py @@ -239,7 +239,7 @@ def h3d_is_object_view(scene, obj): def export(file, global_matrix, scene, - use_apply_modifiers=False, + use_mesh_modifiers=False, use_selection=True, use_triangulate=False, use_normals=False, @@ -1428,9 +1428,9 @@ def export(file, ident += '\t' elif obj_type in {'MESH', 'CURVE', 'SURFACE', 'FONT'}: - if (obj_type != 'MESH') or (use_apply_modifiers and obj.is_modified(scene, 'PREVIEW')): + if (obj_type != 'MESH') or (use_mesh_modifiers and obj.is_modified(scene, 'PREVIEW')): try: - me = obj.to_mesh(scene, use_apply_modifiers, 'PREVIEW') + me = obj.to_mesh(scene, use_mesh_modifiers, 'PREVIEW') except: me = None do_remove = True @@ -1568,7 +1568,7 @@ def gzip_open_utf8(filepath, mode): def save(operator, context, filepath="", use_selection=True, - use_apply_modifiers=False, + use_mesh_modifiers=False, use_triangulate=False, use_normals=False, use_compress=False, @@ -1595,7 +1595,7 @@ def save(operator, context, filepath="", export(file, global_matrix, context.scene, - use_apply_modifiers=use_apply_modifiers, + use_mesh_modifiers=use_mesh_modifiers, use_selection=use_selection, use_triangulate=use_triangulate, use_normals=use_normals, diff --git a/render_povray/__init__.py b/render_povray/__init__.py index d9438b3998c10cbbcf4617202151e9e33c71cdcd..e5e456007341986e5c9ade5cd041a7c3ed7e0ee0 100644 --- a/render_povray/__init__.py +++ b/render_povray/__init__.py @@ -74,16 +74,16 @@ class RenderPovSettingsScene(PropertyGroup): name="Scene Name", description="Name of POV-Ray scene to create. Empty name will use the name of " "the blend file", - default="", maxlen=1024) + maxlen=1024) scene_path = StringProperty( name="Export scene path", # description="Path to directory where the exported scene (POV and INI) is created", # Bug in POV-Ray RC3 description="Path to directory where the files are created", - default="", maxlen=1024, subtype="DIR_PATH") + maxlen=1024, subtype="DIR_PATH") renderimage_path = StringProperty( name="Rendered image path", description="Full path to directory where the rendered image is saved", - default="", maxlen=1024, subtype="DIR_PATH") + maxlen=1024, subtype="DIR_PATH") list_lf_enable = BoolProperty( name="LF in lists", description="Enable line breaks in lists (vectors and indices). Disabled: " @@ -140,7 +140,7 @@ class RenderPovSettingsScene(PropertyGroup): name="Command Line Switches", description="Command line switches consist of a + (plus) or - (minus) sign, followed " "by one or more alphabetic characters and possibly a numeric value", - default="", maxlen=500) + maxlen=500) antialias_enable = BoolProperty( name="Anti-Alias", description="Enable Anti-Aliasing",