diff options
| author | Hans Goudey <h.goudey@me.com> | 2022-01-20 22:56:50 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2022-01-20 22:56:50 +0300 |
| commit | d419b906de94d14a46804951dae4b6a818c77ede (patch) | |
| tree | 8c88c90d5a687b4e2da16f3a824f4a54aef690f9 /release/scripts | |
| parent | cee7c8f56c869033d6db2149b352a3ccee98585f (diff) | |
| parent | e1ae95f6b2a3106c008e94b11cda9ba3e6d59ae3 (diff) | |
Merge branch 'master' into temp-geometry-nodes-extrude-mesh
Diffstat (limited to 'release/scripts')
| m--------- | release/scripts/addons | 0 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_data_mesh.py | 1 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_userpref.py | 1 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 4 | ||||
| -rw-r--r-- | release/scripts/startup/nodeitems_builtins.py | 1 |
5 files changed, 7 insertions, 0 deletions
diff --git a/release/scripts/addons b/release/scripts/addons -Subproject c08568cc376d2e4298710c4172fb0c74f0611de +Subproject 6afec05c3286cdea58ab269fb8dd1f5de011de4 diff --git a/release/scripts/startup/bl_ui/properties_data_mesh.py b/release/scripts/startup/bl_ui/properties_data_mesh.py index ba5ecd1efde..49f196640d8 100644 --- a/release/scripts/startup/bl_ui/properties_data_mesh.py +++ b/release/scripts/startup/bl_ui/properties_data_mesh.py @@ -557,6 +557,7 @@ class DATA_PT_customdata(MeshButtonsPanel, Panel): col.enabled = obj is not None and obj.mode != 'EDIT' col.prop(me, "use_customdata_vertex_bevel", text="Vertex Bevel Weight") col.prop(me, "use_customdata_edge_bevel", text="Edge Bevel Weight") + col.prop(me, "use_customdata_vertex_crease", text="Vertex Crease") col.prop(me, "use_customdata_edge_crease", text="Edge Crease") diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index e3ae536bc37..0548486c786 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -2320,6 +2320,7 @@ class USERPREF_PT_experimental_debugging(ExperimentalPanel, Panel): ({"property": "use_cycles_debug"}, None), ({"property": "use_geometry_nodes_legacy"}, "T91274"), ({"property": "show_asset_debug_info"}, None), + ({"property": "use_asset_indexing"}, None), ), ) diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 11e272fddde..5eca606216e 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -4026,6 +4026,10 @@ class VIEW3D_MT_edit_mesh_vertices(Menu): layout.separator() + layout.operator("transform.vert_crease") + + layout.separator() + layout.operator("mesh.blend_from_shape") layout.operator("mesh.shape_propagate_to_all", text="Propagate to Shapes") diff --git a/release/scripts/startup/nodeitems_builtins.py b/release/scripts/startup/nodeitems_builtins.py index 7150211059b..f0d91ce5de8 100644 --- a/release/scripts/startup/nodeitems_builtins.py +++ b/release/scripts/startup/nodeitems_builtins.py @@ -705,6 +705,7 @@ geometry_node_categories = [ NodeItem("GeometryNodeCurvePrimitiveCircle"), NodeItem("GeometryNodeCurveStar"), NodeItem("GeometryNodeCurveSpiral"), + NodeItem("GeometryNodeCurveArc"), NodeItem("GeometryNodeCurveQuadraticBezier"), NodeItem("GeometryNodeCurvePrimitiveQuadrilateral"), NodeItem("GeometryNodeCurvePrimitiveBezierSegment"), |