Merge branch 'blender-v2.93-release'
This commit is contained in:
commit
54c5835293
|
@ -1603,6 +1603,12 @@ static void editbmesh_calc_modifiers(struct Depsgraph *depsgraph,
|
|||
/* This geometry set contains the non-mesh data that might be generated by modifiers. */
|
||||
GeometrySet geometry_set_final;
|
||||
|
||||
/* Add the initial mesh component, with a copy of the vertex group names from the object,
|
||||
* since they need to be stored in the geometry set for evaluation. */
|
||||
MeshComponent &initial_mesh_component =
|
||||
geometry_set_final.get_component_for_write<MeshComponent>();
|
||||
initial_mesh_component.copy_vertex_group_names_from_object(*ob);
|
||||
|
||||
/* Deformed vertex locations array. Deform only modifier need this type of
|
||||
* float array rather than MVert*. Tracked along with mesh_final as an
|
||||
* optimization to avoid copying coordinates back and forth if there are
|
||||
|
|
|
@ -677,8 +677,7 @@ static void ui_searchbox_region_draw_cb(const bContext *C, ARegion *region)
|
|||
}
|
||||
|
||||
/* The previous menu item draws the active selection. */
|
||||
ui_draw_menu_item(
|
||||
&data->fstyle, &rect, name_sep, icon, state & ~UI_ACTIVE, separator_type, NULL);
|
||||
ui_draw_menu_item(&data->fstyle, &rect, name_sep, icon, state, separator_type, NULL);
|
||||
}
|
||||
}
|
||||
/* indicate more */
|
||||
|
|
|
@ -404,6 +404,7 @@ static void spreadsheet_main_region_listener(const wmRegionListenerParams *param
|
|||
}
|
||||
break;
|
||||
}
|
||||
case NC_TEXTURE:
|
||||
case NC_GEOM: {
|
||||
ED_region_tag_redraw(region);
|
||||
break;
|
||||
|
|
Loading…
Reference in New Issue