Merge branch 'blender-v4.0-release'

This commit is contained in:
Richard Antalik
2023-11-06 06:09:38 +01:00
2 changed files with 2 additions and 2 deletions
@@ -387,9 +387,9 @@ class NODE_MT_geometry_node_GEO_MESH_WRITE(Menu):
def draw(self, context):
layout = self.layout
node_add_menu.add_node_type(layout, "GeometryNodeSetShadeSmooth")
if context.space_data.geometry_nodes_type == 'TOOL':
node_add_menu.add_node_type(layout, "GeometryNodeToolSetFaceSet")
node_add_menu.add_node_type(layout, "GeometryNodeSetShadeSmooth")
node_add_menu.draw_assets_for_catalog(layout, "Mesh/Write")
@@ -1896,7 +1896,7 @@ static int sequencer_separate_images_exec(bContext *C, wmOperator *op)
seq_new->start = start_ofs;
seq_new->type = SEQ_TYPE_IMAGE;
seq_new->len = 1;
seq->flag |= SEQ_SINGLE_FRAME_CONTENT;
seq_new->flag |= SEQ_SINGLE_FRAME_CONTENT;
seq_new->endofs = 1 - step;
/* New strip. */