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 /archipack | |
| parent | 772b5e1e245b76f0aab8b962d1e537b75ec0fbfe (diff) | |
| parent | f1c55295b0d95307559c1f8b09d6b8bd6c8bbbf0 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'archipack')
| -rw-r--r-- | archipack/presets/archipack_materials/floor.txt | 2 | ||||
| -rw-r--r-- | archipack/presets/archipack_materials/roof.txt | 2 | ||||
| -rw-r--r-- | archipack/presets/archipack_roof/braas_1.py | 2 | ||||
| -rw-r--r-- | archipack/presets/archipack_roof/braas_2.py | 2 | ||||
| -rw-r--r-- | archipack/presets/archipack_roof/eternit.py | 2 | ||||
| -rw-r--r-- | archipack/presets/archipack_roof/lauze.py | 2 | ||||
| -rw-r--r-- | archipack/presets/archipack_roof/round.py | 2 | ||||
| -rw-r--r-- | archipack/presets/archipack_roof/square.py | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/archipack/presets/archipack_materials/floor.txt b/archipack/presets/archipack_materials/floor.txt index ad94757c..1afa9329 100644 --- a/archipack/presets/archipack_materials/floor.txt +++ b/archipack/presets/archipack_materials/floor.txt @@ -19,4 +19,4 @@ TILES##|##Floor_tiles_alt6 TILES##|##Floor_alt7 TILES##|##Floor_alt8 TILES##|##Floor_alt9 -TILES##|##Floor_alt10
\ No newline at end of file +TILES##|##Floor_alt10 diff --git a/archipack/presets/archipack_materials/roof.txt b/archipack/presets/archipack_materials/roof.txt index 0c15bcf7..4738c544 100644 --- a/archipack/presets/archipack_materials/roof.txt +++ b/archipack/presets/archipack_materials/roof.txt @@ -45,4 +45,4 @@ METAL##|##Roof_metal METAL##|##Roof_metal2 METAL##|##Roof_metal3 METAL##|##Roof_metal4 -METAL##|##Roof_metal5
\ No newline at end of file +METAL##|##Roof_metal5 diff --git a/archipack/presets/archipack_roof/braas_1.py b/archipack/presets/archipack_roof/braas_1.py index 442eb450..203d44db 100644 --- a/archipack/presets/archipack_roof/braas_1.py +++ b/archipack/presets/archipack_roof/braas_1.py @@ -28,4 +28,4 @@ d.tile_alternate = False d.hip_alt = 0.13 d.tile_bevel_segs = 2 d.tile_fit_x = False -d.valley_enable = True
\ No newline at end of file +d.valley_enable = True diff --git a/archipack/presets/archipack_roof/braas_2.py b/archipack/presets/archipack_roof/braas_2.py index f027ca95..cdd77493 100644 --- a/archipack/presets/archipack_roof/braas_2.py +++ b/archipack/presets/archipack_roof/braas_2.py @@ -28,4 +28,4 @@ d.tile_alternate = False d.hip_alt = 0.13 d.tile_bevel_segs = 2 d.tile_fit_x = False -d.valley_enable = True
\ No newline at end of file +d.valley_enable = True diff --git a/archipack/presets/archipack_roof/eternit.py b/archipack/presets/archipack_roof/eternit.py index 697df83b..4d9f064b 100644 --- a/archipack/presets/archipack_roof/eternit.py +++ b/archipack/presets/archipack_roof/eternit.py @@ -28,4 +28,4 @@ d.tile_alternate = True d.hip_alt = 0.12 d.tile_bevel_segs = 3 d.tile_fit_x = False -d.valley_enable = True
\ No newline at end of file +d.valley_enable = True diff --git a/archipack/presets/archipack_roof/lauze.py b/archipack/presets/archipack_roof/lauze.py index 5b71b871..2eeca130 100644 --- a/archipack/presets/archipack_roof/lauze.py +++ b/archipack/presets/archipack_roof/lauze.py @@ -28,4 +28,4 @@ d.tile_alternate = True d.hip_alt = 0.13 d.tile_bevel_segs = 3 d.tile_fit_x = False -d.valley_enable = True
\ No newline at end of file +d.valley_enable = True diff --git a/archipack/presets/archipack_roof/round.py b/archipack/presets/archipack_roof/round.py index 4705348e..74b7cb09 100644 --- a/archipack/presets/archipack_roof/round.py +++ b/archipack/presets/archipack_roof/round.py @@ -28,4 +28,4 @@ d.tile_alternate = True d.hip_alt = 0.1 d.tile_bevel_segs = 3 d.tile_fit_x = False -d.valley_enable = True
\ No newline at end of file +d.valley_enable = True diff --git a/archipack/presets/archipack_roof/square.py b/archipack/presets/archipack_roof/square.py index edfa3848..f8d92dd1 100644 --- a/archipack/presets/archipack_roof/square.py +++ b/archipack/presets/archipack_roof/square.py @@ -28,4 +28,4 @@ d.tile_alternate = True d.hip_alt = 0.12 d.tile_bevel_segs = 3 d.tile_fit_x = False -d.valley_enable = True
\ No newline at end of file +d.valley_enable = True |