diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-09-07 23:18:54 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-09-07 23:19:10 +0300 |
| commit | 4c132dc503c7c9506e301be5b479c6c579ce9723 (patch) | |
| tree | 0cdd69eed9169d4b30a8c37dd33e5f80790ce3cc /io_import_dxf | |
| parent | 772b5e1e245b76f0aab8b962d1e537b75ec0fbfe (diff) | |
| parent | f1c55295b0d95307559c1f8b09d6b8bd6c8bbbf0 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'io_import_dxf')
| -rw-r--r-- | io_import_dxf/dxfgrabber/drawing.py | 2 | ||||
| -rw-r--r-- | io_import_dxf/dxfgrabber/dxfentities.py | 1 | ||||
| -rw-r--r-- | io_import_dxf/dxfgrabber/juliandate.py | 2 | ||||
| -rw-r--r-- | io_import_dxf/dxfgrabber/layers.py | 1 | ||||
| -rw-r--r-- | io_import_dxf/dxfgrabber/linetypes.py | 1 | ||||
| -rw-r--r-- | io_import_dxf/dxfimport/convert.py | 6 | ||||
| -rw-r--r-- | io_import_dxf/dxfimport/is_.py | 2 |
7 files changed, 6 insertions, 9 deletions
diff --git a/io_import_dxf/dxfgrabber/drawing.py b/io_import_dxf/dxfgrabber/drawing.py index f9a01faf..db739b23 100644 --- a/io_import_dxf/dxfgrabber/drawing.py +++ b/io_import_dxf/dxfgrabber/drawing.py @@ -62,4 +62,4 @@ class Drawing(object): def resolve_text_styles(entities, text_styles): for entity in entities: if hasattr(entity, 'resolve_text_style'): - entity.resolve_text_style(text_styles)
\ No newline at end of file + entity.resolve_text_style(text_styles) diff --git a/io_import_dxf/dxfgrabber/dxfentities.py b/io_import_dxf/dxfgrabber/dxfentities.py index 4dfcd3c9..61ff351c 100644 --- a/io_import_dxf/dxfgrabber/dxfentities.py +++ b/io_import_dxf/dxfgrabber/dxfentities.py @@ -1261,4 +1261,3 @@ def entity_factory(tags): entity = cls() # call constructor list(entity.setup_attributes(tags)) # setup dxf attributes - chain of generators return entity - diff --git a/io_import_dxf/dxfgrabber/juliandate.py b/io_import_dxf/dxfgrabber/juliandate.py index 68c5c8e1..3fbbb5b8 100644 --- a/io_import_dxf/dxfgrabber/juliandate.py +++ b/io_import_dxf/dxfgrabber/juliandate.py @@ -70,4 +70,4 @@ def julian_date(date): def calendar_date(juliandate): - return CalendarDate(juliandate).result
\ No newline at end of file + return CalendarDate(juliandate).result diff --git a/io_import_dxf/dxfgrabber/layers.py b/io_import_dxf/dxfgrabber/layers.py index 02ef66e8..a82e5ec8 100644 --- a/io_import_dxf/dxfgrabber/layers.py +++ b/io_import_dxf/dxfgrabber/layers.py @@ -87,4 +87,3 @@ class LayerTable(Table): layer = Layer(entrytags) layers._table_entries[layer.name] = layer return layers - diff --git a/io_import_dxf/dxfgrabber/linetypes.py b/io_import_dxf/dxfgrabber/linetypes.py index 8e4441bb..4d7caba6 100644 --- a/io_import_dxf/dxfgrabber/linetypes.py +++ b/io_import_dxf/dxfgrabber/linetypes.py @@ -35,4 +35,3 @@ class LinetypeTable(Table): style = Linetype(entry_tags) styles._table_entries[style.name] = style return styles - diff --git a/io_import_dxf/dxfimport/convert.py b/io_import_dxf/dxfimport/convert.py index 717bd4f2..8935480e 100644 --- a/io_import_dxf/dxfimport/convert.py +++ b/io_import_dxf/dxfimport/convert.py @@ -278,14 +278,14 @@ def split_by_width(entity): en_template.bulge = [] en_template.width = [] en_template.tangents = [] - - # is_closed is an attrib only on polyline + + # is_closed is an attrib only on polyline if en_template.dxftype == 'POLYLINE': en_template.is_closed = False else: # disable closed flag (0x01) when is_closed is a @property en_template.flags ^= 1 - + i = 0 for pair, same_width in itertools.groupby(entity.width, key=lambda w: WidthTuple(w)): en = deepcopy(en_template) diff --git a/io_import_dxf/dxfimport/is_.py b/io_import_dxf/dxfimport/is_.py index c6777530..021e69d3 100644 --- a/io_import_dxf/dxfimport/is_.py +++ b/io_import_dxf/dxfimport/is_.py @@ -143,4 +143,4 @@ def extrusion(entity): if entity.extrusion is None: return False return Vector(entity.extrusion) != Vector((0, 0, 1)) \ - or (hasattr(entity, "elevation") and entity.elevation != 0)
\ No newline at end of file + or (hasattr(entity, "elevation") and entity.elevation != 0) |