[Bf-blender-cvs] [c13bf40ab1a] master: Merge branch 'blender-v2.83-release'
Campbell Barton
noreply at git.blender.org
Thu May 21 08:35:56 CEST 2020
Commit: c13bf40ab1a3faf7b866598cdca92f2caae80fae
Author: Campbell Barton
Date: Thu May 21 16:34:20 2020 +1000
Branches: master
https://developer.blender.org/rBc13bf40ab1a3faf7b866598cdca92f2caae80fae
Merge branch 'blender-v2.83-release'
===================================================================
===================================================================
diff --cc release/scripts/presets/tracking_camera/1__colon__2.3_inch.py
index 218e51a53a6,218e51a53a6..9fcd40fbb65
--- 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,4 +7,3 @@@ camera.pixel_aspect =
camera.k1 = 0.0
camera.k2 = 0.0
camera.k3 = 0.0
--
diff --cc release/scripts/presets/tracking_camera/1__colon__2.5_inch.py
index 0f16dc9b503,0f16dc9b503..2f064e59838
--- 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,4 +7,3 @@@ camera.pixel_aspect =
camera.k1 = 0.0
camera.k2 = 0.0
camera.k3 = 0.0
--
diff --cc release/scripts/presets/tracking_camera/2__colon__3_inch.py
index 079d0c6308f,079d0c6308f..8936e627d77
--- 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,4 +7,3 @@@ camera.pixel_aspect =
camera.k1 = 0.0
camera.k2 = 0.0
camera.k3 = 0.0
--
diff --cc release/scripts/presets/tracking_camera/4__colon__3_inch.py
index 0d3313ab755,0d3313ab755..2317715e1b4
--- 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,4 +7,3 @@@ camera.pixel_aspect =
camera.k1 = 0.0
camera.k2 = 0.0
camera.k3 = 0.0
--
diff --cc release/scripts/presets/tracking_camera/Arri_Alexa.py
index 7144f9a03aa,7144f9a03aa..ded361ec965
--- a/release/scripts/presets/tracking_camera/Arri_Alexa.py
+++ b/release/scripts/presets/tracking_camera/Arri_Alexa.py
@@@ -7,4 -7,4 +7,3 @@@ camera.pixel_aspect =
camera.k1 = 0.0
camera.k2 = 0.0
camera.k3 = 0.0
--
diff --cc release/scripts/presets/tracking_camera/Canon_1100D.py
index dc09e3d0896,dc09e3d0896..96d6d456337
--- a/release/scripts/presets/tracking_camera/Canon_1100D.py
+++ b/release/scripts/presets/tracking_camera/Canon_1100D.py
@@@ -7,4 -7,4 +7,3 @@@ camera.pixel_aspect =
camera.k1 = 0.0
camera.k2 = 0.0
camera.k3 = 0.0
--
diff --cc release/scripts/presets/tracking_camera/Canon_APS-C.py
index c55716a06a8,c55716a06a8..cc4da545272
--- a/release/scripts/presets/tracking_camera/Canon_APS-C.py
+++ b/release/scripts/presets/tracking_camera/Canon_APS-C.py
@@@ -7,4 -7,4 +7,3 @@@ camera.pixel_aspect =
camera.k1 = 0.0
camera.k2 = 0.0
camera.k3 = 0.0
--
diff --cc release/scripts/presets/tracking_camera/Canon_APS-H.py
index 0b757edef20,0b757edef20..853edd5dcba
--- a/release/scripts/presets/tracking_camera/Canon_APS-H.py
+++ b/release/scripts/presets/tracking_camera/Canon_APS-H.py
@@@ -7,4 -7,4 +7,3 @@@ camera.pixel_aspect =
camera.k1 = 0.0
camera.k2 = 0.0
camera.k3 = 0.0
--
diff --cc release/scripts/presets/tracking_camera/Canon_C300.py
index 24fbbc78ff7,24fbbc78ff7..809f8f432f8
--- a/release/scripts/presets/tracking_camera/Canon_C300.py
+++ b/release/scripts/presets/tracking_camera/Canon_C300.py
@@@ -7,4 -7,4 +7,3 @@@ camera.pixel_aspect =
camera.k1 = 0.0
camera.k2 = 0.0
camera.k3 = 0.0
--
diff --cc release/scripts/presets/tracking_camera/Full_Frame_35mm_Camera.py
index 478e53584fb,478e53584fb..0f3da0b4d72
--- 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,4 +7,3 @@@ camera.pixel_aspect =
camera.k1 = 0.0
camera.k2 = 0.0
camera.k3 = 0.0
--
diff --cc release/scripts/presets/tracking_camera/GoPro_Hero3_Black.py
index 47e026e9d00,47e026e9d00..29851352284
--- a/release/scripts/presets/tracking_camera/GoPro_Hero3_Black.py
+++ b/release/scripts/presets/tracking_camera/GoPro_Hero3_Black.py
@@@ -8,4 -8,4 +8,3 @@@ camera.pixel_aspect =
camera.k1 = 0.0
camera.k2 = 0.0
camera.k3 = 0.0
--
diff --cc release/scripts/presets/tracking_camera/GoPro_Hero3_Silver.py
index 10ca885769a,10ca885769a..9e08cf283a7
--- a/release/scripts/presets/tracking_camera/GoPro_Hero3_Silver.py
+++ b/release/scripts/presets/tracking_camera/GoPro_Hero3_Silver.py
@@@ -8,4 -8,4 +8,3 @@@ camera.pixel_aspect =
camera.k1 = 0.0
camera.k2 = 0.0
camera.k3 = 0.0
--
diff --cc release/scripts/presets/tracking_camera/GoPro_Hero3_White.py
index c9bda2258c8,c9bda2258c8..6b1f9d97e81
--- a/release/scripts/presets/tracking_camera/GoPro_Hero3_White.py
+++ b/release/scripts/presets/tracking_camera/GoPro_Hero3_White.py
@@@ -8,4 -8,4 +8,3 @@@ camera.pixel_aspect =
camera.k1 = 0.0
camera.k2 = 0.0
camera.k3 = 0.0
--
diff --cc release/scripts/presets/tracking_camera/Nexus_5.py
index 68ec347d3e1,68ec347d3e1..172c8e93bfd
--- a/release/scripts/presets/tracking_camera/Nexus_5.py
+++ b/release/scripts/presets/tracking_camera/Nexus_5.py
@@@ -8,4 -8,4 +8,3 @@@ camera.pixel_aspect =
camera.k1 = 0.0
camera.k2 = 0.0
camera.k3 = 0.0
--
diff --cc release/scripts/presets/tracking_camera/Samsung_Galaxy_S3.py
index 6dbdaefbd2f,6dbdaefbd2f..d10994e45f5
--- a/release/scripts/presets/tracking_camera/Samsung_Galaxy_S3.py
+++ b/release/scripts/presets/tracking_camera/Samsung_Galaxy_S3.py
@@@ -8,4 -8,4 +8,3 @@@ camera.pixel_aspect =
camera.k1 = 0.0
camera.k2 = 0.0
camera.k3 = 0.0
--
diff --cc release/scripts/presets/tracking_camera/Samsung_Galaxy_S4.py
index 051cdf64402,051cdf64402..c5fef80b3de
--- a/release/scripts/presets/tracking_camera/Samsung_Galaxy_S4.py
+++ b/release/scripts/presets/tracking_camera/Samsung_Galaxy_S4.py
@@@ -8,4 -8,4 +8,3 @@@ camera.pixel_aspect =
camera.k1 = 0.0
camera.k2 = 0.0
camera.k3 = 0.0
--
diff --cc release/scripts/presets/tracking_camera/Super_16.py
index f1a8bb37328,f1a8bb37328..e94da9a99ba
--- a/release/scripts/presets/tracking_camera/Super_16.py
+++ b/release/scripts/presets/tracking_camera/Super_16.py
@@@ -7,4 -7,4 +7,3 @@@ camera.pixel_aspect =
camera.k1 = 0.0
camera.k2 = 0.0
camera.k3 = 0.0
--
diff --cc release/scripts/presets/tracking_camera/Super_35.py
index f533d3e4bcf,f533d3e4bcf..e07edc3a22c
--- a/release/scripts/presets/tracking_camera/Super_35.py
+++ b/release/scripts/presets/tracking_camera/Super_35.py
@@@ -7,4 -7,4 +7,3 @@@ camera.pixel_aspect =
camera.k1 = 0.0
camera.k2 = 0.0
camera.k3 = 0.0
--
diff --cc release/scripts/presets/tracking_camera/iPhone_4.py
index b0ac49706b3,b0ac49706b3..220e5e08147
--- a/release/scripts/presets/tracking_camera/iPhone_4.py
+++ b/release/scripts/presets/tracking_camera/iPhone_4.py
@@@ -8,4 -8,4 +8,3 @@@ camera.pixel_aspect =
camera.k1 = 0.0
camera.k2 = 0.0
camera.k3 = 0.0
--
diff --cc release/scripts/presets/tracking_camera/iPhone_4S.py
index 2569f9b412b,2569f9b412b..686cffc8f99
--- a/release/scripts/presets/tracking_camera/iPhone_4S.py
+++ b/release/scripts/presets/tracking_camera/iPhone_4S.py
@@@ -8,4 -8,4 +8,3 @@@ camera.pixel_aspect =
camera.k1 = 0.0
camera.k2 = 0.0
camera.k3 = 0.0
--
diff --cc release/scripts/presets/tracking_camera/iPhone_5.py
index f7944e3fa63,f7944e3fa63..d8e05da8425
--- a/release/scripts/presets/tracking_camera/iPhone_5.py
+++ b/release/scripts/presets/tracking_camera/iPhone_5.py
@@@ -8,4 -8,4 +8,3 @@@ camera.pixel_aspect =
camera.k1 = 0.0
camera.k2 = 0.0
camera.k3 = 0.0
--
diff --cc source/blender/draw/engines/gpencil/shaders/gpencil_vert.glsl
index c6cfee5ef2d,c6cfee5ef2d..225601eb9ba
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_vert.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_vert.glsl
@@@ -2,4 -2,4 +2,4 @@@
void main()
{
gpencil_vertex();
--}
++}
diff --cc source/blender/draw/engines/workbench/shaders/workbench_merge_infront_frag.glsl
index 58becb03290,58becb03290..b77e168889f
--- 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 +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;
--}
++}
diff --cc source/blender/draw/engines/workbench/shaders/workbench_world_light_lib.glsl
index 81f6e651be0,81f6e651be0..41ef516ee4d
--- 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 +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;
--}
++}
More information about the Bf-blender-cvs
mailing list