ilusha/blender
1
0
Fork 0
mirror of https://github.com/blender/blender synced 2026-09-29 04:37:17 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into blender2.8

Browse source
This commit is contained in:
Campbell Barton 2018-06-04 18:49:43 +02:00
commit da53c3f020
86 changed files with 736 additions and 736 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/python/modules/test_utils.py
View file

@ -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.