[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [4244] trunk/py/scripts/addons: make option for applying modifiers consistent
Campbell Barton
ideasman42 at gmail.com
Thu Feb 7 05:25:56 CET 2013
Revision: 4244
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=4244
Author: campbellbarton
Date: 2013-02-07 04:25:53 +0000 (Thu, 07 Feb 2013)
Log Message:
-----------
make option for applying modifiers consistent
Modified Paths:
--------------
trunk/py/scripts/addons/io_mesh_ply/__init__.py
trunk/py/scripts/addons/io_mesh_ply/export_ply.py
trunk/py/scripts/addons/io_mesh_stl/__init__.py
trunk/py/scripts/addons/io_mesh_stl/blender_utils.py
trunk/py/scripts/addons/io_scene_obj/__init__.py
trunk/py/scripts/addons/io_scene_obj/export_obj.py
trunk/py/scripts/addons/io_scene_x3d/__init__.py
trunk/py/scripts/addons/io_scene_x3d/export_x3d.py
trunk/py/scripts/addons/render_povray/__init__.py
Modified: trunk/py/scripts/addons/io_mesh_ply/__init__.py
===================================================================
--- trunk/py/scripts/addons/io_mesh_ply/__init__.py 2013-02-06 10:58:48 UTC (rev 4243)
+++ trunk/py/scripts/addons/io_mesh_ply/__init__.py 2013-02-07 04:25:53 UTC (rev 4244)
@@ -89,7 +89,7 @@
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 @@
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")
Modified: trunk/py/scripts/addons/io_mesh_ply/export_ply.py
===================================================================
--- trunk/py/scripts/addons/io_mesh_ply/export_ply.py 2013-02-06 10:58:48 UTC (rev 4243)
+++ trunk/py/scripts/addons/io_mesh_ply/export_ply.py 2013-02-07 04:25:53 UTC (rev 4244)
@@ -31,7 +31,7 @@
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 @@
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 @@
file.close()
print("writing %r done" % filepath)
- if use_modifiers:
+ if use_mesh_modifiers:
bpy.data.meshes.remove(mesh)
# XXX
Modified: trunk/py/scripts/addons/io_mesh_stl/__init__.py
===================================================================
--- trunk/py/scripts/addons/io_mesh_stl/__init__.py 2013-02-06 10:58:48 UTC (rev 4243)
+++ trunk/py/scripts/addons/io_mesh_stl/__init__.py 2013-02-07 04:25:53 UTC (rev 4244)
@@ -115,13 +115,16 @@
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 @@
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)
Modified: trunk/py/scripts/addons/io_mesh_stl/blender_utils.py
===================================================================
--- trunk/py/scripts/addons/io_mesh_stl/blender_utils.py 2013-02-06 10:58:48 UTC (rev 4243)
+++ trunk/py/scripts/addons/io_mesh_stl/blender_utils.py 2013-02-07 04:25:53 UTC (rev 4244)
@@ -41,14 +41,14 @@
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 @@
# 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
Modified: trunk/py/scripts/addons/io_scene_obj/__init__.py
===================================================================
--- trunk/py/scripts/addons/io_scene_obj/__init__.py 2013-02-06 10:58:48 UTC (rev 4243)
+++ trunk/py/scripts/addons/io_scene_obj/__init__.py 2013-02-07 04:25:53 UTC (rev 4244)
@@ -221,7 +221,7 @@
)
# object group
- use_apply_modifiers = BoolProperty(
+ use_mesh_modifiers = BoolProperty(
name="Apply Modifiers",
description="Apply modifiers (preview resolution)",
default=True,
Modified: trunk/py/scripts/addons/io_scene_obj/export_obj.py
===================================================================
--- trunk/py/scripts/addons/io_scene_obj/export_obj.py 2013-02-06 10:58:48 UTC (rev 4243)
+++ trunk/py/scripts/addons/io_scene_obj/export_obj.py 2013-02-07 04:25:53 UTC (rev 4244)
@@ -732,7 +732,7 @@
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 @@
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,
Modified: trunk/py/scripts/addons/io_scene_x3d/__init__.py
===================================================================
--- trunk/py/scripts/addons/io_scene_x3d/__init__.py 2013-02-06 10:58:48 UTC (rev 4243)
+++ trunk/py/scripts/addons/io_scene_x3d/__init__.py 2013-02-07 04:25:53 UTC (rev 4244)
@@ -109,7 +109,7 @@
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,
Modified: trunk/py/scripts/addons/io_scene_x3d/export_x3d.py
===================================================================
--- trunk/py/scripts/addons/io_scene_x3d/export_x3d.py 2013-02-06 10:58:48 UTC (rev 4243)
+++ trunk/py/scripts/addons/io_scene_x3d/export_x3d.py 2013-02-07 04:25:53 UTC (rev 4244)
@@ -239,7 +239,7 @@
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 @@
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 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 @@
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,
Modified: trunk/py/scripts/addons/render_povray/__init__.py
===================================================================
--- trunk/py/scripts/addons/render_povray/__init__.py 2013-02-06 10:58:48 UTC (rev 4243)
+++ trunk/py/scripts/addons/render_povray/__init__.py 2013-02-07 04:25:53 UTC (rev 4244)
@@ -74,16 +74,16 @@
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 @@
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",
More information about the Bf-extensions-cvs
mailing list