Merge branch 'master' into blender2.8

2018-06-04 18:49:43 +02:00
parent c8af234f85 58e8c71cbd
commit da53c3f020
86 changed files with 736 additions and 736 deletions
@@ -61,7 +61,7 @@ class AbstractBlenderRunnerTest(unittest.TestCase):
    # Set in a subclass
    blender: pathlib.Path = None
    testdir: pathlib.Path = None
-    
+

    def run_blender(self, filepath: str, python_script: str, timeout: int=300) -> str:
        """Runs Blender by opening a blendfile and executing a script.