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_blend_utils | |
| parent | 772b5e1e245b76f0aab8b962d1e537b75ec0fbfe (diff) | |
| parent | f1c55295b0d95307559c1f8b09d6b8bd6c8bbbf0 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'io_blend_utils')
| -rw-r--r-- | io_blend_utils/bl_utils/subprocess_helper.py | 1 | ||||
| -rw-r--r-- | io_blend_utils/blender_bam-unpacked.whl/bam/utils/system.py | 1 | ||||
| -rw-r--r-- | io_blend_utils/utils/system.py | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/io_blend_utils/bl_utils/subprocess_helper.py b/io_blend_utils/bl_utils/subprocess_helper.py index ef9c602a..f7750af7 100644 --- a/io_blend_utils/bl_utils/subprocess_helper.py +++ b/io_blend_utils/bl_utils/subprocess_helper.py @@ -186,4 +186,3 @@ class SubprocessHelper: self._wm_exit(context) self._process.kill() self.process_post(-1) - diff --git a/io_blend_utils/blender_bam-unpacked.whl/bam/utils/system.py b/io_blend_utils/blender_bam-unpacked.whl/bam/utils/system.py index 313173ee..f4d3469b 100644 --- a/io_blend_utils/blender_bam-unpacked.whl/bam/utils/system.py +++ b/io_blend_utils/blender_bam-unpacked.whl/bam/utils/system.py @@ -140,4 +140,3 @@ def is_subdir(path, directory): if path.startswith(directory.rstrip(sep) + sep): return True return False - diff --git a/io_blend_utils/utils/system.py b/io_blend_utils/utils/system.py index 313173ee..f4d3469b 100644 --- a/io_blend_utils/utils/system.py +++ b/io_blend_utils/utils/system.py @@ -140,4 +140,3 @@ def is_subdir(path, directory): if path.startswith(directory.rstrip(sep) + sep): return True return False - |