Commit: 430cc9d7bf6ac7271cf91d9ce0b7e254ceeb8fc9
Author: Erik Abrahamsson
Date:   Mon Feb 6 19:32:05 2023 +0100
Branches: master
https://developer.blender.org/rB430cc9d7bf6ac7271cf91d9ce0b7e254ceeb8fc9

Fix T104381: Assert on Circle Select end modal

`em_setup_vivewcontext` cannot be used in this function now as it
expects `obedit` to be a mesh. It also duplicated the viewcontext init.
Instead `BKE_editmesh_from_object` is called only when type is a mesh.

===================================================================

M       source/blender/editors/space_view3d/view3d_select.cc

===================================================================

diff --git a/source/blender/editors/space_view3d/view3d_select.cc 
b/source/blender/editors/space_view3d/view3d_select.cc
index 45222642023..fe7b5ffcfac 100644
--- a/source/blender/editors/space_view3d/view3d_select.cc
+++ b/source/blender/editors/space_view3d/view3d_select.cc
@@ -4751,11 +4751,11 @@ static void view3d_circle_select_recalc(void *user_data)
   Depsgraph *depsgraph = CTX_data_ensure_evaluated_depsgraph(C);
   ViewContext vc;
   ED_view3d_viewcontext_init(C, &vc, depsgraph);
-  em_setup_viewcontext(C, &vc);
 
   if (vc.obedit) {
     switch (vc.obedit->type) {
       case OB_MESH: {
+        vc.em = BKE_editmesh_from_object(vc.obedit);
         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);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to