griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v4.0-release'

Browse Source
This commit is contained in:
Hans Goudey
2023-11-13 12:50:34 +01:00
parent 89d67df37b 5b094ee770
commit e7cee02e4d
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/editors/curves/intern/curves_ops.cc
View File

@@ -905,11 +905,12 @@ static int select_random_exec(bContext *C, wmOperator *op)
for (Curves *curves_id : unique_curves) {
CurvesGeometry &curves = curves_id->geometry.wrap();
const eAttrDomain selection_domain = eAttrDomain(curves_id->selection_domain);
const int domain_size = curves.attributes().domain_size(selection_domain);
IndexMaskMemory memory;
const IndexMask inv_random_elements = random_mask(
curves, selection_domain, seed, probability, memory)
.complement(curves.points_range(), memory);
.complement(IndexRange(domain_size), memory);
const bool was_anything_selected = has_anything_selected(curves);
bke::GSpanAttributeWriter selection = ensure_selection_attribute(

4
source/blender/editors/space_node/add_menu_assets.cc
View File

@@ -187,7 +187,7 @@ static void node_add_catalog_assets_draw(const bContext *C, Menu *menu)
IFACE_(asset->get_name().c_str()),
ICON_NONE,
nullptr,
WM_OP_INVOKE_DEFAULT,
WM_OP_INVOKE_REGION_WIN,
UI_ITEM_NONE,
&op_ptr);
asset::operator_asset_reference_props_set(*asset, op_ptr);
@@ -234,7 +234,7 @@ static void node_add_unassigned_assets_draw(const bContext *C, Menu *menu)
IFACE_(asset->get_name().c_str()),
ICON_NONE,
nullptr,
WM_OP_INVOKE_DEFAULT,
WM_OP_INVOKE_REGION_WIN,
UI_ITEM_NONE,
&op_ptr);
asset::operator_asset_reference_props_set(*asset, op_ptr);