diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-10-11 22:29:46 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-10-11 22:31:58 +0300 |
| commit | 3842519a387ede582950c96d155c74dce3c4c059 (patch) | |
| tree | ebed911aa71907ed2cae087f8776226bffb656ee /release/scripts/startup/bl_ui/space_view3d_toolbar.py | |
| parent | 20b2acf336cb8f6965fd39728a746922d1b8ae42 (diff) | |
Revert "Merge branch 'master' into blender-v2.81-release"
This reverts commit 20b2acf336cb8f6965fd39728a746922d1b8ae42, reversing
changes made to f185cc0ca55c8c817903d53bf5c107f3efd4e0db.
Merges should only go form the release branch to master. For backporting
commits, use cherry-pick.
Diffstat (limited to 'release/scripts/startup/bl_ui/space_view3d_toolbar.py')
| -rw-r--r-- | release/scripts/startup/bl_ui/space_view3d_toolbar.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index 8da5ba67187..3aee14e0239 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -1873,8 +1873,7 @@ class VIEW3D_PT_tools_grease_pencil_brush(View3DPanel, Panel): from bl_ui.properties_paint_common import ( brush_basic_gpencil_paint_settings, ) - tool = context.workspace.tools.from_space_view3d_mode(context.mode, create=False) - brush_basic_gpencil_paint_settings(layout, context, brush, tool, compact=True, is_toolbar=False) + brush_basic_gpencil_paint_settings(layout, context, brush, compact=True) # Grease Pencil drawing brushes options |