diff options
author | Joseph Eagar <joeedh@gmail.com> | 2022-09-24 00:17:43 +0300 |
---|---|---|
committer | Joseph Eagar <joeedh@gmail.com> | 2022-09-24 00:17:43 +0300 |
commit | f7d698b244a0e27a6bec42caa929819781f7ea8e (patch) | |
tree | 79da87a5939c031344a8081eac484db1097551a7 /release/scripts | |
parent | c5ab67e8144fc40360a617d03a62a6e640c1eefc (diff) | |
parent | c2a21dfb7714bf25431291f6598f43109af46446 (diff) |
Merge branch 'master' into temp-sculpt-cavity-mask
Diffstat (limited to 'release/scripts')
-rw-r--r-- | release/scripts/startup/bl_ui/properties_data_mesh.py | 12 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_image.py | 12 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d_toolbar.py | 2 | ||||
-rw-r--r-- | release/scripts/startup/nodeitems_builtins.py | 4 |
4 files changed, 18 insertions, 12 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_mesh.py b/release/scripts/startup/bl_ui/properties_data_mesh.py index d878eea0cb9..a775a3cfa1b 100644 --- a/release/scripts/startup/bl_ui/properties_data_mesh.py +++ b/release/scripts/startup/bl_ui/properties_data_mesh.py @@ -503,11 +503,15 @@ class DATA_PT_customdata(MeshButtonsPanel, Panel): else: col.operator("mesh.customdata_bevel_weight_vertex_add", icon='ADD') - col = layout.column(heading="Store") + if me.has_crease_edge: + col.operator("mesh.customdata_crease_edge_clear", icon='X') + else: + col.operator("mesh.customdata_crease_edge_add", icon='ADD') - col.enabled = obj is not None and obj.mode != 'EDIT' - col.prop(me, "use_customdata_vertex_crease", text="Vertex Crease") - col.prop(me, "use_customdata_edge_crease", text="Edge Crease") + if me.has_crease_vertex: + col.operator("mesh.customdata_crease_vertex_clear", icon='X') + else: + col.operator("mesh.customdata_crease_vertex_add", icon='ADD') class DATA_PT_custom_props_mesh(MeshButtonsPanel, PropertyPanel, Panel): diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py index 89d025814f2..cefa4bf7d1d 100644 --- a/release/scripts/startup/bl_ui/space_image.py +++ b/release/scripts/startup/bl_ui/space_image.py @@ -537,10 +537,12 @@ class IMAGE_MT_pivot_pie(Menu): layout = self.layout pie = layout.menu_pie() - pie.prop_enum(context.space_data, "pivot_point", value='CENTER') - pie.prop_enum(context.space_data, "pivot_point", value='CURSOR') - pie.prop_enum(context.space_data, "pivot_point", value='INDIVIDUAL_ORIGINS') - pie.prop_enum(context.space_data, "pivot_point", value='MEDIAN') + sima = context.space_data + + pie.prop_enum(sima, "pivot_point", value='CENTER') + pie.prop_enum(sima, "pivot_point", value='CURSOR') + pie.prop_enum(sima, "pivot_point", value='INDIVIDUAL_ORIGINS') + pie.prop_enum(sima, "pivot_point", value='MEDIAN') class IMAGE_MT_uvs_snap_pie(Menu): @@ -1537,7 +1539,7 @@ class IMAGE_PT_overlay_guides(Panel): row = col.row(align=True) sub = row.row(align=True) sub.prop(uvedit, "show_grid_over_image", text="") - sub.active = context.space_data.image is not None + sub.active = sima.image is not None col = layout.column(align=False, heading="Fixed Subdivisions") col.use_property_decorate = False diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index 093c98d5ec3..59dbbd80ef5 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -1920,10 +1920,8 @@ class VIEW3D_PT_tools_grease_pencil_brush_gap_closure(View3DPanel, Panel): col.prop(gp_settings, "extend_stroke_factor", text="Size") row = col.row(align=True) - row.enabled = gp_settings.extend_stroke_factor > 0 row.prop(gp_settings, "fill_extend_mode", text="Mode") row = col.row(align=True) - row.enabled = gp_settings.extend_stroke_factor > 0 row.prop(gp_settings, "show_fill_extend", text="Visual Aids") diff --git a/release/scripts/startup/nodeitems_builtins.py b/release/scripts/startup/nodeitems_builtins.py index d2188515e16..95bb9fd7e40 100644 --- a/release/scripts/startup/nodeitems_builtins.py +++ b/release/scripts/startup/nodeitems_builtins.py @@ -117,6 +117,7 @@ def mesh_node_items(context): yield NodeItem("GeometryNodeMeshToCurve") yield NodeItem("GeometryNodeMeshToPoints") yield NodeItem("GeometryNodeMeshToVolume") + yield NodeItem("GeometryNodeSampleNearestSurface") yield NodeItem("GeometryNodeScaleElements") yield NodeItem("GeometryNodeSplitEdges") yield NodeItem("GeometryNodeSubdivideMesh") @@ -154,6 +155,8 @@ def geometry_node_items(context): yield NodeItem("GeometryNodeJoinGeometry") yield NodeItem("GeometryNodeMergeByDistance") yield NodeItem("GeometryNodeRaycast") + yield NodeItem("GeometryNodeSampleIndex") + yield NodeItem("GeometryNodeSampleNearest") yield NodeItem("GeometryNodeSeparateComponents") yield NodeItem("GeometryNodeSeparateGeometry") yield NodeItem("GeometryNodeTransform") @@ -650,7 +653,6 @@ geometry_node_categories = [ NodeItem("GeometryNodeCaptureAttribute"), NodeItem("GeometryNodeAttributeDomainSize"), NodeItem("GeometryNodeAttributeStatistic"), - NodeItem("GeometryNodeAttributeTransfer"), NodeItem("GeometryNodeRemoveAttribute"), NodeItem("GeometryNodeStoreNamedAttribute"), ]), |