blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 761 Projects 19 Wiki Activity

Cleanup: minor tweak to recent fix for T10438 

Minor change to [0], prefer calling em_setup_viewcontext,
even though there is no functional difference at the moment,
if this function ever performs additional operations than assigning
`ViewContext.em`, it would have to be manually in-lined in
`view3d_circle_select_recalc`.

[0]: 430cc9d7bf
This commit is contained in:
Campbell Barton 2023-02-07 16:11:02 +11:00
parent 44daeaae7d
commit 622cad7073
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/editors/space_view3d/view3d_select.cc
View File

@ -4748,14 +4748,13 @@ static bool object_circle_select(ViewContext *vc,
static void view3d_circle_select_recalc(void *user_data)
{
bContext *C = static_cast<bContext *>(user_data);
Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C);
ViewContext vc;
ED_view3d_viewcontext_init(C, &vc, depsgraph);
Object *obedit_active = CTX_data_edit_object(C);
if (vc.obedit) {
switch (vc.obedit->type) {
if (obedit_active) {
switch (obedit_active->type) {
case OB_MESH: {
vc.em = BKE_editmesh_from_object(vc.obedit);
ViewContext vc;
em_setup_viewcontext(C, &vc);
FOREACH_OBJECT_IN_MODE_BEGIN (
vc.scene, vc.view_layer, vc.v3d, vc.obact->type, vc.obact->mode, ob_iter) {
ED_view3d_viewcontext_init_object(&vc, ob_iter);
@ -4766,8 +4765,11 @@ static void view3d_circle_select_recalc(void *user_data)
break;
}
default:
default: {
/* TODO: investigate if this is needed for other object types. */
CTX_data_ensure_evaluated_depsgraph(C);
break;
}
}
}
}