kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Merge branch 'blender-v2.83-release'

Browse Source
This commit is contained in:
Campbell Barton 2020-05-21 16:34:20 +10:00
commit c13bf40ab1
28 changed files with 4 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
release/scripts/presets/tracking_camera/1__colon__2.3_inch.py
View File

@ -7,4 +7,3 @@ camera.pixel_aspect = 1
camera.k1 = 0.0
camera.k2 = 0.0
camera.k3 = 0.0

1
release/scripts/presets/tracking_camera/1__colon__2.5_inch.py
View File

@ -7,4 +7,3 @@ camera.pixel_aspect = 1
camera.k1 = 0.0
camera.k2 = 0.0
camera.k3 = 0.0

1
release/scripts/presets/tracking_camera/2__colon__3_inch.py
View File

@ -7,4 +7,3 @@ camera.pixel_aspect = 1
camera.k1 = 0.0
camera.k2 = 0.0
camera.k3 = 0.0

1
release/scripts/presets/tracking_camera/4__colon__3_inch.py
View File

@ -7,4 +7,3 @@ camera.pixel_aspect = 1
camera.k1 = 0.0
camera.k2 = 0.0
camera.k3 = 0.0

1
release/scripts/presets/tracking_camera/Arri_Alexa.py
View File

@ -7,4 +7,3 @@ camera.pixel_aspect = 1
camera.k1 = 0.0
camera.k2 = 0.0
camera.k3 = 0.0

1
release/scripts/presets/tracking_camera/Canon_1100D.py
View File

@ -7,4 +7,3 @@ camera.pixel_aspect = 1
camera.k1 = 0.0
camera.k2 = 0.0
camera.k3 = 0.0

1
release/scripts/presets/tracking_camera/Canon_APS-C.py
View File

@ -7,4 +7,3 @@ camera.pixel_aspect = 1
camera.k1 = 0.0
camera.k2 = 0.0
camera.k3 = 0.0

1
release/scripts/presets/tracking_camera/Canon_APS-H.py
View File

@ -7,4 +7,3 @@ camera.pixel_aspect = 1
camera.k1 = 0.0
camera.k2 = 0.0
camera.k3 = 0.0

1
release/scripts/presets/tracking_camera/Canon_C300.py
View File

@ -7,4 +7,3 @@ camera.pixel_aspect = 1
camera.k1 = 0.0
camera.k2 = 0.0
camera.k3 = 0.0

1
release/scripts/presets/tracking_camera/Full_Frame_35mm_Camera.py
View File

@ -7,4 +7,3 @@ camera.pixel_aspect = 1
camera.k1 = 0.0
camera.k2 = 0.0
camera.k3 = 0.0

1
release/scripts/presets/tracking_camera/GoPro_Hero3_Black.py
View File

@ -8,4 +8,3 @@ camera.pixel_aspect = 1
camera.k1 = 0.0
camera.k2 = 0.0
camera.k3 = 0.0

1
release/scripts/presets/tracking_camera/GoPro_Hero3_Silver.py
View File

@ -8,4 +8,3 @@ camera.pixel_aspect = 1
camera.k1 = 0.0
camera.k2 = 0.0
camera.k3 = 0.0

1
release/scripts/presets/tracking_camera/GoPro_Hero3_White.py
View File

@ -8,4 +8,3 @@ camera.pixel_aspect = 1
camera.k1 = 0.0
camera.k2 = 0.0
camera.k3 = 0.0

1
release/scripts/presets/tracking_camera/Nexus_5.py
View File

@ -8,4 +8,3 @@ camera.pixel_aspect = 1
camera.k1 = 0.0
camera.k2 = 0.0
camera.k3 = 0.0

1
release/scripts/presets/tracking_camera/Samsung_Galaxy_S3.py
View File

@ -8,4 +8,3 @@ camera.pixel_aspect = 1
camera.k1 = 0.0
camera.k2 = 0.0
camera.k3 = 0.0

1
release/scripts/presets/tracking_camera/Samsung_Galaxy_S4.py
View File

@ -8,4 +8,3 @@ camera.pixel_aspect = 1
camera.k1 = 0.0
camera.k2 = 0.0
camera.k3 = 0.0

1
release/scripts/presets/tracking_camera/Super_16.py
View File

@ -7,4 +7,3 @@ camera.pixel_aspect = 1
camera.k1 = 0.0
camera.k2 = 0.0
camera.k3 = 0.0

1
release/scripts/presets/tracking_camera/Super_35.py
View File

@ -7,4 +7,3 @@ camera.pixel_aspect = 1
camera.k1 = 0.0
camera.k2 = 0.0
camera.k3 = 0.0

1
release/scripts/presets/tracking_camera/iPhone_4.py
View File

@ -8,4 +8,3 @@ camera.pixel_aspect = 1
camera.k1 = 0.0
camera.k2 = 0.0
camera.k3 = 0.0

1
release/scripts/presets/tracking_camera/iPhone_4S.py
View File

@ -8,4 +8,3 @@ camera.pixel_aspect = 1
camera.k1 = 0.0
camera.k2 = 0.0
camera.k3 = 0.0

1
release/scripts/presets/tracking_camera/iPhone_5.py
View File

@ -8,4 +8,3 @@ camera.pixel_aspect = 1
camera.k1 = 0.0
camera.k2 = 0.0
camera.k3 = 0.0

1
release/scripts/startup/bl_ui/properties_render.py
View File

@ -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'}

2
release/scripts/startup/bl_ui/space_userpref.py
View File

@ -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():

1
release/scripts/startup/bl_ui/space_view3d.py
View File

@ -3183,7 +3183,6 @@ class VIEW3D_MT_face_sets_init(Menu):
op.mode = 'FACE_MAPS'
class VIEW3D_MT_particle(Menu):
bl_label = "Particle"

4
release/scripts/startup/bl_ui/space_view3d_toolbar.py
View File

@ -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"

2
source/blender/draw/engines/gpencil/shaders/gpencil_vert.glsl
View File

@ -2,4 +2,4 @@
void main()
{
gpencil_vertex();
}
}

2
source/blender/draw/engines/workbench/shaders/workbench_merge_infront_frag.glsl
View File

@ -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;
}
}

2
source/blender/draw/engines/workbench/shaders/workbench_world_light_lib.glsl
View File

@ -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;
}
}