diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-05-21 09:34:20 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-05-21 09:34:20 +0300 |
| commit | c13bf40ab1a3faf7b866598cdca92f2caae80fae (patch) | |
| tree | 8b27e7925a82933e9894ba8ddef60c0758f68657 /release/scripts/startup | |
| parent | 0ff663b6fc1c403e680dc7c6ed7b420a7d54faa5 (diff) | |
| parent | fcfb87def9378e874c9bb32638bd58ac5c06d19a (diff) | |
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'release/scripts/startup')
4 files changed, 1 insertions, 7 deletions
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" |