Merge branch 'master' into blender2.8

1 files changed, 6 insertions, 5 deletions

diff --git a/release/scripts/modules/bpy/utils/__init__.py b/release/scripts/modules/bpy/utils/__init__.py
index c3175f93f4e..5e5a35b9518 100644
--- a/release/scripts/modules/bpy/utils/__init__.py
+++ b/release/scripts/modules/bpy/utils/__init__.py
@@ -488,11 +488,11 @@ def smpte_from_frame(frame, fps=None, fps_base=None):
 
     return (
         "%s%02d:%02d:%02d:%02d" % (
-        sign,
-        int(frame / (3600 * fps)),          # HH
-        int((frame / (60 * fps)) % 60),     # MM
-        int((frame / fps) % 60),            # SS
-        int(frame % fps),                   # FF
+            sign,
+            int(frame / (3600 * fps)),          # HH
+            int((frame / (60 * fps)) % 60),     # MM
+            int((frame / fps) % 60),            # SS
+            int(frame % fps),                   # FF
         ))
 
 
@@ -773,6 +773,7 @@ def _blender_default_map():
     del _sys.modules["rna_manual_reference"]
     return ret
 
+
 # hooks for doc lookups
 _manual_map = [_blender_default_map]