Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonio Vazquez <blendergit@gmail.com>2020-02-05 13:08:57 +0300
committerAntonio Vazquez <blendergit@gmail.com>2020-02-05 13:08:57 +0300
commitedcec3aee03da94936c9f7167a51b63ff62ff07d (patch)
tree1763f0f25cd6425d64c827b2b86b6a035755c684 /release
parent79003fa0c415abce4bbc6f186e855175fd1b61b5 (diff)
parentdb0121a0099836113e7babe7f006e99e4f6ed69f (diff)
Merge branch 'blender-v2.82-release'
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/properties_paint_common.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/release/scripts/startup/bl_ui/properties_paint_common.py b/release/scripts/startup/bl_ui/properties_paint_common.py
index a9e8cae3c8b..ec3dec6c54d 100644
--- a/release/scripts/startup/bl_ui/properties_paint_common.py
+++ b/release/scripts/startup/bl_ui/properties_paint_common.py
@@ -996,6 +996,8 @@ def brush_basic_texpaint_settings(layout, context, brush, *, compact=False):
def brush_basic_gpencil_paint_settings(layout, context, brush, *, compact=False):
gp_settings = brush.gpencil_settings
tool = context.workspace.tools.from_space_view3d_mode(context.mode, create=False)
+ if gp_settings is None:
+ return
# Brush details
if brush.gpencil_tool == 'ERASE':