Merge branch 'master' into blender2.8

2018-07-02 12:03:56 +02:00
parent ad5a20efce b88e51dd55
commit b076b3853c
190 changed files with 611 additions and 606 deletions
--- a/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
+++ b/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
@@ -122,7 +122,7 @@ class PlayRenderedAnim(Operator):
                file = rd.frame_path(frame=scene.frame_start, preview=False)
                file = bpy.path.abspath(file)  # expand '//'
                if not os.path.exists(file):
-                    self.report({'WARNING'}, "File {file!r} not found")
+                    self.report({'WARNING'}, f"File {file!r} not found")

        cmd = [player_path]
        # extra options, fps controls etc.