diff options
| author | Hans Goudey <h.goudey@me.com> | 2021-04-20 00:57:02 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2021-04-20 00:57:02 +0300 |
| commit | 6b44605cec1d0fe195ffcd97317a0ff4f949a05b (patch) | |
| tree | bc1729fd8ab5f6be6ac17cfeda6968645a77c0a1 /release/scripts/startup | |
| parent | 2e76c3565d145a8e4e82644523663062c1b67894 (diff) | |
| parent | 68cbf0a2be8a6636ab3c05aa1d48b17b29e6f791 (diff) | |
Merge branch 'master' into geometry-nodes-curve-support
Diffstat (limited to 'release/scripts/startup')
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_grease_pencil_common.py | 6 | ||||
| -rw-r--r-- | release/scripts/startup/nodeitems_builtins.py | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py index c1d60a127d2..3064b33c7f7 100644 --- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py +++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py @@ -821,6 +821,12 @@ class GreasePencilLayerMasksPanel: col2.menu("GPENCIL_MT_layer_mask_menu", icon='ADD', text="") col2.operator("gpencil.layer_mask_remove", icon='REMOVE', text="") + col2.separator() + + sub = col2.column(align=True) + sub.operator("gpencil.layer_mask_move", icon='TRIA_UP', text="").type = 'UP' + sub.operator("gpencil.layer_mask_move", icon='TRIA_DOWN', text="").type = 'DOWN' + class GreasePencilLayerRelationsPanel: diff --git a/release/scripts/startup/nodeitems_builtins.py b/release/scripts/startup/nodeitems_builtins.py index 3e7a87fc4cc..5518ab9cde5 100644 --- a/release/scripts/startup/nodeitems_builtins.py +++ b/release/scripts/startup/nodeitems_builtins.py @@ -556,6 +556,7 @@ geometry_node_categories = [ NodeItem("ShaderNodeMath"), NodeItem("FunctionNodeBooleanMath"), NodeItem("FunctionNodeFloatCompare"), + NodeItem("GeometryNodeSwitch"), ]), GeometryNodeCategory("GEO_VECTOR", "Vector", items=[ NodeItem("ShaderNodeSeparateXYZ"), |