Merge branch 'master' into blender2.8

This commit is contained in:
Brecht Van Lommel
2018-09-19 18:19:49 +02:00
92 changed files with 141 additions and 141 deletions

View File

@@ -136,7 +136,7 @@ def filter_op_list(operators):
def reset_blend():
bpy.ops.wm.read_factory_settings()
for scene in bpy.data.scenes:
# reduce range so any bake action doesnt take too long
# reduce range so any bake action doesn't take too long
scene.frame_start = 1
scene.frame_end = 5

View File

@@ -181,7 +181,7 @@ def main():
sys.exit(1)
if md5 != md5_new:
print(" Running: %s\n MD5 Recieved: %s\n MD5 Expected: %s" % (run, md5_new, md5))
print(" Running: %s\n MD5 Received: %s\n MD5 Expected: %s" % (run, md5_new, md5))
sys.exit(1)
print(" Success: %s" % run)