diff options
| author | Julian Eisel <julian@blender.org> | 2022-07-20 18:25:31 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2022-07-20 18:25:31 +0300 |
| commit | 9dbcefb10e53cc809eb2e99333376b2a881c0863 (patch) | |
| tree | 9ea058c2877c472aba82650e24e5927e3f03eded /release/scripts/startup/bl_ui/properties_object.py | |
| parent | e1ced645fa208b3b77e07c99cb289cf7fa659ad3 (diff) | |
| parent | 85f0b2ef5d5bfb67c245da0a52aeec44e63445fa (diff) | |
Merge branch 'asset-browser-grid-view' into file-browser-grid-view
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_object.py')
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_object.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/release/scripts/startup/bl_ui/properties_object.py b/release/scripts/startup/bl_ui/properties_object.py index 44c30cf4372..7afa2f81b97 100644 --- a/release/scripts/startup/bl_ui/properties_object.py +++ b/release/scripts/startup/bl_ui/properties_object.py @@ -1,6 +1,4 @@ # SPDX-License-Identifier: GPL-2.0-or-later - -# <pep8 compliant> from bl_ui.properties_animviz import ( MotionPathButtonsPanel, MotionPathButtonsPanel_display, @@ -319,6 +317,12 @@ class OBJECT_PT_lineart(ObjectButtonsPanel, Panel): subrow.active = lineart.use_crease_override subrow.prop(lineart, "crease_threshold", slider=True, text="") + row = layout.row(heading="Intersection Priority") + row.prop(lineart, "use_intersection_priority_override", text="") + subrow = row.row() + subrow.active = lineart.use_intersection_priority_override + subrow.prop(lineart, "intersection_priority", text="") + class OBJECT_PT_motion_paths(MotionPathButtonsPanel, Panel): #bl_label = "Object Motion Paths" |