Skip to content

Commit

Permalink
Set up s_edit before writing to it.
Browse files Browse the repository at this point in the history
  • Loading branch information
starseeker committed Feb 1, 2025
1 parent ddeed7b commit 0df2d1a
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions src/mged/chgtree.c
Original file line number Diff line number Diff line change
Expand Up @@ -258,10 +258,20 @@ cmd_oed(ClientData clientData, Tcl_Interp *interp, int argc, const char *argv[])
db_dup_full_path(&both, &lhs);
db_append_full_path(&both, &rhs);


/* Patterned after ill_common() ... */
illum_gdlp = gdlp;
illump = BU_LIST_NEXT(bv_scene_obj, &gdlp->dl_head_scene_obj);/* any valid solid would do */

/* Set up solid edit state */
struct ged_bv_data *bdata = (struct ged_bv_data *)illump->s_u_data;
s->s_edit = mged_solid_edit_create(&bdata->s_fullpath, s->dbip, &s->tol.tol, view_state->vs_gvp);
if (s->s_edit) {
Tcl_LinkVar(s->interp, "edit_solid_flag", (char *)&s->s_edit->edit_flag, TCL_LINK_INT);
s->s_edit->mv_context = mged_variables->mv_context;
s->s_edit->vlfree = &rt_vlfree;
mged_sedit_clbk_sync(s->s_edit, s);
}

/* Patterned after ill_common() ... */
edobj = 0; /* sanity */
movedir = 0; /* No edit modes set */
MAT_IDN(s->s_edit->model_changes); /* No changes yet */
Expand All @@ -285,16 +295,6 @@ cmd_oed(ClientData clientData, Tcl_Interp *interp, int argc, const char *argv[])
(void)chg_state(s, ST_O_PICK, ST_O_PATH, "internal change of state");


/* Set up solid edit state */
struct ged_bv_data *bdata = (struct ged_bv_data *)illump->s_u_data;
s->s_edit = mged_solid_edit_create(&bdata->s_fullpath, s->dbip, &s->tol.tol, view_state->vs_gvp);
if (s->s_edit) {
Tcl_LinkVar(s->interp, "edit_solid_flag", (char *)&s->s_edit->edit_flag, TCL_LINK_INT);
s->s_edit->mv_context = mged_variables->mv_context;
s->s_edit->vlfree = &rt_vlfree;
mged_sedit_clbk_sync(s->s_edit, s);
}

/* Select the matrix */
struct bu_vls tcl_cmd = BU_VLS_INIT_ZERO;
bu_vls_printf(&tcl_cmd, "matpick %lu", (long unsigned)lhs.fp_len);
Expand Down

0 comments on commit 0df2d1a

Please sign in to comment.