Merge branch 'blender-v2.83-release'

28 files changed, 4 insertions, 31 deletions

diff --git a/release/scripts/presets/tracking_camera/1__colon__2.3_inch.py b/release/scripts/presets/tracking_camera/1__colon__2.3_inch.py
index 218e51a53a6..9fcd40fbb65 100644
--- a/release/scripts/presets/tracking_camera/1__colon__2.3_inch.py
+++ b/release/scripts/presets/tracking_camera/1__colon__2.3_inch.py
@@ -7,4 +7,3 @@ camera.pixel_aspect = 1
 camera.k1 = 0.0
 camera.k2 = 0.0
 camera.k3 = 0.0
-
diff --git a/release/scripts/presets/tracking_camera/1__colon__2.5_inch.py b/release/scripts/presets/tracking_camera/1__colon__2.5_inch.py
index 0f16dc9b503..2f064e59838 100644
--- a/release/scripts/presets/tracking_camera/1__colon__2.5_inch.py
+++ b/release/scripts/presets/tracking_camera/1__colon__2.5_inch.py
@@ -7,4 +7,3 @@ camera.pixel_aspect = 1
 camera.k1 = 0.0
 camera.k2 = 0.0
 camera.k3 = 0.0
-
diff --git a/release/scripts/presets/tracking_camera/2__colon__3_inch.py b/release/scripts/presets/tracking_camera/2__colon__3_inch.py
index 079d0c6308f..8936e627d77 100644
--- a/release/scripts/presets/tracking_camera/2__colon__3_inch.py
+++ b/release/scripts/presets/tracking_camera/2__colon__3_inch.py
@@ -7,4 +7,3 @@ camera.pixel_aspect = 1
 camera.k1 = 0.0
 camera.k2 = 0.0
 camera.k3 = 0.0
-
diff --git a/release/scripts/presets/tracking_camera/4__colon__3_inch.py b/release/scripts/presets/tracking_camera/4__colon__3_inch.py
index 0d3313ab755..2317715e1b4 100644
--- a/release/scripts/presets/tracking_camera/4__colon__3_inch.py
+++ b/release/scripts/presets/tracking_camera/4__colon__3_inch.py
@@ -7,4 +7,3 @@ camera.pixel_aspect = 1
 camera.k1 = 0.0
 camera.k2 = 0.0
 camera.k3 = 0.0
-
diff --git a/release/scripts/presets/tracking_camera/Arri_Alexa.py b/release/scripts/presets/tracking_camera/Arri_Alexa.py
index 7144f9a03aa..ded361ec965 100644
--- a/release/scripts/presets/tracking_camera/Arri_Alexa.py
+++ b/release/scripts/presets/tracking_camera/Arri_Alexa.py
@@ -7,4 +7,3 @@ camera.pixel_aspect = 1
 camera.k1 = 0.0
 camera.k2 = 0.0
 camera.k3 = 0.0
-
diff --git a/release/scripts/presets/tracking_camera/Canon_1100D.py b/release/scripts/presets/tracking_camera/Canon_1100D.py
index dc09e3d0896..96d6d456337 100644
--- a/release/scripts/presets/tracking_camera/Canon_1100D.py
+++ b/release/scripts/presets/tracking_camera/Canon_1100D.py
@@ -7,4 +7,3 @@ camera.pixel_aspect = 1
 camera.k1 = 0.0
 camera.k2 = 0.0
 camera.k3 = 0.0
-
diff --git a/release/scripts/presets/tracking_camera/Canon_APS-C.py b/release/scripts/presets/tracking_camera/Canon_APS-C.py
index c55716a06a8..cc4da545272 100644
--- a/release/scripts/presets/tracking_camera/Canon_APS-C.py
+++ b/release/scripts/presets/tracking_camera/Canon_APS-C.py
@@ -7,4 +7,3 @@ camera.pixel_aspect = 1
 camera.k1 = 0.0
 camera.k2 = 0.0
 camera.k3 = 0.0
-
diff --git a/release/scripts/presets/tracking_camera/Canon_APS-H.py b/release/scripts/presets/tracking_camera/Canon_APS-H.py
index 0b757edef20..853edd5dcba 100644
--- a/release/scripts/presets/tracking_camera/Canon_APS-H.py
+++ b/release/scripts/presets/tracking_camera/Canon_APS-H.py
@@ -7,4 +7,3 @@ camera.pixel_aspect = 1
 camera.k1 = 0.0
 camera.k2 = 0.0
 camera.k3 = 0.0
-
diff --git a/release/scripts/presets/tracking_camera/Canon_C300.py b/release/scripts/presets/tracking_camera/Canon_C300.py
index 24fbbc78ff7..809f8f432f8 100644
--- a/release/scripts/presets/tracking_camera/Canon_C300.py
+++ b/release/scripts/presets/tracking_camera/Canon_C300.py
@@ -7,4 +7,3 @@ camera.pixel_aspect = 1
 camera.k1 = 0.0
 camera.k2 = 0.0
 camera.k3 = 0.0
-
diff --git a/release/scripts/presets/tracking_camera/Full_Frame_35mm_Camera.py b/release/scripts/presets/tracking_camera/Full_Frame_35mm_Camera.py
index 478e53584fb..0f3da0b4d72 100644
--- a/release/scripts/presets/tracking_camera/Full_Frame_35mm_Camera.py
+++ b/release/scripts/presets/tracking_camera/Full_Frame_35mm_Camera.py
@@ -7,4 +7,3 @@ camera.pixel_aspect = 1
 camera.k1 = 0.0
 camera.k2 = 0.0
 camera.k3 = 0.0
-
diff --git a/release/scripts/presets/tracking_camera/GoPro_Hero3_Black.py b/release/scripts/presets/tracking_camera/GoPro_Hero3_Black.py
index 47e026e9d00..29851352284 100644
--- a/release/scripts/presets/tracking_camera/GoPro_Hero3_Black.py
+++ b/release/scripts/presets/tracking_camera/GoPro_Hero3_Black.py
@@ -8,4 +8,3 @@ camera.pixel_aspect = 1
 camera.k1 = 0.0
 camera.k2 = 0.0
 camera.k3 = 0.0
-
diff --git a/release/scripts/presets/tracking_camera/GoPro_Hero3_Silver.py b/release/scripts/presets/tracking_camera/GoPro_Hero3_Silver.py
index 10ca885769a..9e08cf283a7 100644
--- a/release/scripts/presets/tracking_camera/GoPro_Hero3_Silver.py
+++ b/release/scripts/presets/tracking_camera/GoPro_Hero3_Silver.py
@@ -8,4 +8,3 @@ camera.pixel_aspect = 1
 camera.k1 = 0.0
 camera.k2 = 0.0
 camera.k3 = 0.0
-
diff --git a/release/scripts/presets/tracking_camera/GoPro_Hero3_White.py b/release/scripts/presets/tracking_camera/GoPro_Hero3_White.py
index c9bda2258c8..6b1f9d97e81 100644
--- a/release/scripts/presets/tracking_camera/GoPro_Hero3_White.py
+++ b/release/scripts/presets/tracking_camera/GoPro_Hero3_White.py
@@ -8,4 +8,3 @@ camera.pixel_aspect = 1
 camera.k1 = 0.0
 camera.k2 = 0.0
 camera.k3 = 0.0
-
diff --git a/release/scripts/presets/tracking_camera/Nexus_5.py b/release/scripts/presets/tracking_camera/Nexus_5.py
index 68ec347d3e1..172c8e93bfd 100644
--- a/release/scripts/presets/tracking_camera/Nexus_5.py
+++ b/release/scripts/presets/tracking_camera/Nexus_5.py
@@ -8,4 +8,3 @@ camera.pixel_aspect = 1
 camera.k1 = 0.0
 camera.k2 = 0.0
 camera.k3 = 0.0
-
diff --git a/release/scripts/presets/tracking_camera/Samsung_Galaxy_S3.py b/release/scripts/presets/tracking_camera/Samsung_Galaxy_S3.py
index 6dbdaefbd2f..d10994e45f5 100644
--- a/release/scripts/presets/tracking_camera/Samsung_Galaxy_S3.py
+++ b/release/scripts/presets/tracking_camera/Samsung_Galaxy_S3.py
@@ -8,4 +8,3 @@ camera.pixel_aspect = 1
 camera.k1 = 0.0
 camera.k2 = 0.0
 camera.k3 = 0.0
-
diff --git a/release/scripts/presets/tracking_camera/Samsung_Galaxy_S4.py b/release/scripts/presets/tracking_camera/Samsung_Galaxy_S4.py
index 051cdf64402..c5fef80b3de 100644
--- a/release/scripts/presets/tracking_camera/Samsung_Galaxy_S4.py
+++ b/release/scripts/presets/tracking_camera/Samsung_Galaxy_S4.py
@@ -8,4 +8,3 @@ camera.pixel_aspect = 1
 camera.k1 = 0.0
 camera.k2 = 0.0
 camera.k3 = 0.0
-
diff --git a/release/scripts/presets/tracking_camera/Super_16.py b/release/scripts/presets/tracking_camera/Super_16.py
index f1a8bb37328..e94da9a99ba 100644
--- a/release/scripts/presets/tracking_camera/Super_16.py
+++ b/release/scripts/presets/tracking_camera/Super_16.py
@@ -7,4 +7,3 @@ camera.pixel_aspect = 1
 camera.k1 = 0.0
 camera.k2 = 0.0
 camera.k3 = 0.0
-
diff --git a/release/scripts/presets/tracking_camera/Super_35.py b/release/scripts/presets/tracking_camera/Super_35.py
index f533d3e4bcf..e07edc3a22c 100644
--- a/release/scripts/presets/tracking_camera/Super_35.py
+++ b/release/scripts/presets/tracking_camera/Super_35.py
@@ -7,4 +7,3 @@ camera.pixel_aspect = 1
 camera.k1 = 0.0
 camera.k2 = 0.0
 camera.k3 = 0.0
-
diff --git a/release/scripts/presets/tracking_camera/iPhone_4.py b/release/scripts/presets/tracking_camera/iPhone_4.py
index b0ac49706b3..220e5e08147 100644
--- a/release/scripts/presets/tracking_camera/iPhone_4.py
+++ b/release/scripts/presets/tracking_camera/iPhone_4.py
@@ -8,4 +8,3 @@ camera.pixel_aspect = 1
 camera.k1 = 0.0
 camera.k2 = 0.0
 camera.k3 = 0.0
-
diff --git a/release/scripts/presets/tracking_camera/iPhone_4S.py b/release/scripts/presets/tracking_camera/iPhone_4S.py
index 2569f9b412b..686cffc8f99 100644
--- a/release/scripts/presets/tracking_camera/iPhone_4S.py
+++ b/release/scripts/presets/tracking_camera/iPhone_4S.py
@@ -8,4 +8,3 @@ camera.pixel_aspect = 1
 camera.k1 = 0.0
 camera.k2 = 0.0
 camera.k3 = 0.0
-
diff --git a/release/scripts/presets/tracking_camera/iPhone_5.py b/release/scripts/presets/tracking_camera/iPhone_5.py
index f7944e3fa63..d8e05da8425 100644
--- a/release/scripts/presets/tracking_camera/iPhone_5.py
+++ b/release/scripts/presets/tracking_camera/iPhone_5.py
@@ -8,4 +8,3 @@ camera.pixel_aspect = 1
 camera.k1 = 0.0
 camera.k2 = 0.0
 camera.k3 = 0.0
-
diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py
index b1ae6290ae7..155bbb523c7 100644
--- a/release/scripts/startup/bl_ui/properties_render.py
+++ b/release/scripts/startup/bl_ui/properties_render.py
@@ -551,7 +551,6 @@ class RENDER_PT_gpencil(RenderButtonsPanel, Panel):
         col.prop(props, "antialias_threshold")
 
 
-
 class RENDER_PT_opengl_sampling(RenderButtonsPanel, Panel):
     bl_label = "Sampling"
     COMPAT_ENGINES = {'BLENDER_WORKBENCH'}
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index 153533dbde6..7aa5a6e045e 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -1080,7 +1080,7 @@ class PreferenceThemeSpacePanel:
         PreferenceThemeSpacePanel._theme_generic(layout, data, self.theme_area)
 
 
-class ThemeGenericClassGenerator():
+class ThemeGenericClassGenerator:
 
     @staticmethod
     def generate_panel_classes_for_wcols():
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index f288c955c92..d83d20a63cb 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -3183,7 +3183,6 @@ class VIEW3D_MT_face_sets_init(Menu):
         op.mode = 'FACE_MAPS'
 
 
-
 class VIEW3D_MT_particle(Menu):
     bl_label = "Particle"
 
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 83144b33c67..3d72a2a588c 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -777,10 +777,6 @@ class VIEW3D_PT_sculpt_dyntopo(Panel, View3DPaintPanel):
         col.prop(sculpt, "use_smooth_shading")
 
 
-
-
-
-
 class VIEW3D_PT_sculpt_voxel_remesh(Panel, View3DPaintPanel):
     bl_context = ".sculpt_mode"  # dot on purpose (access from topbar)
     bl_label = "Remesh"
diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_vert.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_vert.glsl
index c6cfee5ef2d..225601eb9ba 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_vert.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_vert.glsl
@@ -2,4 +2,4 @@
 void main()
 {
   gpencil_vertex();
-}
\ No newline at end of file
+}
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_merge_infront_frag.glsl b/source/blender/draw/engines/workbench/shaders/workbench_merge_infront_frag.glsl
index 58becb03290..b77e168889f 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_merge_infront_frag.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_merge_infront_frag.glsl
@@ -15,4 +15,4 @@ void main()
   /* Make this fragment occlude any fragment that will try to
    * render over it in the normal passes. */
   gl_FragDepth = 0.0;
-}
\ No newline at end of file
+}
diff --git a/source/blender/draw/engines/workbench/shaders/workbench_world_light_lib.glsl b/source/blender/draw/engines/workbench/shaders/workbench_world_light_lib.glsl
index 81f6e651be0..41ef516ee4d 100644
--- a/source/blender/draw/engines/workbench/shaders/workbench_world_light_lib.glsl
+++ b/source/blender/draw/engines/workbench/shaders/workbench_world_light_lib.glsl
@@ -128,4 +128,4 @@ float get_shadow(vec3 N)
   float shadow_mix = smoothstep(world_data.shadow_shift, world_data.shadow_focus, light_factor);
   shadow_mix *= forceShadowing ? 0.0 : world_data.shadow_mul;
   return shadow_mix + world_data.shadow_add;
-}
\ No newline at end of file
+}