Skip to content

Commit

Permalink
Update defines, remove ged header includes
Browse files Browse the repository at this point in the history
  • Loading branch information
@starseeker
starseeker committed Feb 4, 2025
1 parent cc23246 commit 1857da8
Show file tree
Hide file tree
Showing 29 changed files with 167 additions and 197 deletions.
34 changes: 17 additions & 17 deletions src/mged/mged_impl.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,25 +63,25 @@ mged_state_create(void)
s->s_edit = NULL;

// Register default callbacks
mged_state_clbk_set(s, 0, ECMD_PRINT_STR, 0, GED_CLBK_DURING, mged_print_str, s);
mged_state_clbk_set(s, 0, ECMD_PRINT_RESULTS, 0, GED_CLBK_DURING, mged_print_result, s);
mged_state_clbk_set(s, 0, ECMD_EAXES_POS , 0, GED_CLBK_DURING, set_e_axes_pos, s);
mged_state_clbk_set(s, 0, ECMD_REPLOT_EDITING_SOLID, 0, GED_CLBK_DURING, replot_editing_solid, s);
mged_state_clbk_set(s, 0, ECMD_VIEW_UPDATE, 0, GED_CLBK_DURING, mged_view_update, s);
mged_state_clbk_set(s, 0, ECMD_VIEW_SET_FLAG, 0, GED_CLBK_DURING, mged_view_set_flag, s);
mged_state_clbk_set(s, 0, ECMD_MENU_SET, 0, GED_CLBK_DURING, mged_mmenu_set, s);
mged_state_clbk_set(s, 0, ECMD_GET_FILENAME, 0, GED_CLBK_DURING, mged_get_filename, s);
mged_state_clbk_set(s, 0, ECMD_PRINT_STR, 0, BU_CLBK_DURING, mged_print_str, s);
mged_state_clbk_set(s, 0, ECMD_PRINT_RESULTS, 0, BU_CLBK_DURING, mged_print_result, s);
mged_state_clbk_set(s, 0, ECMD_EAXES_POS , 0, BU_CLBK_DURING, set_e_axes_pos, s);
mged_state_clbk_set(s, 0, ECMD_REPLOT_EDITING_SOLID, 0, BU_CLBK_DURING, replot_editing_solid, s);
mged_state_clbk_set(s, 0, ECMD_VIEW_UPDATE, 0, BU_CLBK_DURING, mged_view_update, s);
mged_state_clbk_set(s, 0, ECMD_VIEW_SET_FLAG, 0, BU_CLBK_DURING, mged_view_set_flag, s);
mged_state_clbk_set(s, 0, ECMD_MENU_SET, 0, BU_CLBK_DURING, mged_mmenu_set, s);
mged_state_clbk_set(s, 0, ECMD_GET_FILENAME, 0, BU_CLBK_DURING, mged_get_filename, s);

// Register primitive/ecmd specific callbacks
mged_state_clbk_set(s, ID_ARB8, ECMD_ARB_SETUP_ROTFACE, 0, GED_CLBK_DURING, arb_setup_rotface_clbk, s);
mged_state_clbk_set(s, ID_BOT, ECMD_BOT_MODE, 0, GED_CLBK_DURING, ecmd_bot_mode_clbk, s);
mged_state_clbk_set(s, ID_BOT, ECMD_BOT_ORIENT, 0, GED_CLBK_DURING, ecmd_bot_orient_clbk, s);
mged_state_clbk_set(s, ID_BOT, ECMD_BOT_THICK, 0, GED_CLBK_DURING, ecmd_bot_thick_clbk, s);
mged_state_clbk_set(s, ID_BOT, ECMD_BOT_FLAGS, 0, GED_CLBK_DURING, ecmd_bot_flags_clbk, s);
mged_state_clbk_set(s, ID_BOT, ECMD_BOT_FMODE, 0, GED_CLBK_DURING, ecmd_bot_fmode_clbk, s);
mged_state_clbk_set(s, ID_BOT, ECMD_BOT_PICKT, 0, GED_CLBK_DURING, ecmd_bot_pickt_multihit_clbk, s);
mged_state_clbk_set(s, ID_NMG, ECMD_NMG_EDEBUG, 0, GED_CLBK_DURING, ecmd_nmg_edebug_clbk, s);
mged_state_clbk_set(s, ID_EXTRUDE, ECMD_EXTR_SKT_NAME, 0, GED_CLBK_DURING, ecmd_extrude_skt_name_clbk, s);
mged_state_clbk_set(s, ID_ARB8, ECMD_ARB_SETUP_ROTFACE, 0, BU_CLBK_DURING, arb_setup_rotface_clbk, s);
mged_state_clbk_set(s, ID_BOT, ECMD_BOT_MODE, 0, BU_CLBK_DURING, ecmd_bot_mode_clbk, s);
mged_state_clbk_set(s, ID_BOT, ECMD_BOT_ORIENT, 0, BU_CLBK_DURING, ecmd_bot_orient_clbk, s);
mged_state_clbk_set(s, ID_BOT, ECMD_BOT_THICK, 0, BU_CLBK_DURING, ecmd_bot_thick_clbk, s);
mged_state_clbk_set(s, ID_BOT, ECMD_BOT_FLAGS, 0, BU_CLBK_DURING, ecmd_bot_flags_clbk, s);
mged_state_clbk_set(s, ID_BOT, ECMD_BOT_FMODE, 0, BU_CLBK_DURING, ecmd_bot_fmode_clbk, s);
mged_state_clbk_set(s, ID_BOT, ECMD_BOT_PICKT, 0, BU_CLBK_DURING, ecmd_bot_pickt_multihit_clbk, s);
mged_state_clbk_set(s, ID_NMG, ECMD_NMG_EDEBUG, 0, BU_CLBK_DURING, ecmd_nmg_edebug_clbk, s);
mged_state_clbk_set(s, ID_EXTRUDE, ECMD_EXTR_SKT_NAME, 0, BU_CLBK_DURING, ecmd_extrude_skt_name_clbk, s);

return s;
}
Expand Down
43 changes: 21 additions & 22 deletions src/mged/primitives/edarb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
#include "vmath.h"
#include "rt/geom.h"
#include "rt/arb_edit.h"
#include "ged.h"
#include "rt/db4.h"

#include "./edarb.h"
Expand Down Expand Up @@ -70,7 +69,7 @@ arb8_edge(struct rt_solid_edit *s, int arg, int UNUSED(a), int UNUSED(b), void *
bu_clbk_t f = NULL;
void *d = NULL;
int flag = 1;
rt_solid_edit_clbk_get(&f, &d, s, ECMD_EAXES_POS, 0, GED_CLBK_DURING);
rt_solid_edit_clbk_get(&f, &d, s, ECMD_EAXES_POS, 0, BU_CLBK_DURING);
if (f)
(*f)(0, NULL, d, &flag);
}
Expand Down Expand Up @@ -114,7 +113,7 @@ arb7_edge(struct rt_solid_edit *s, int arg, int UNUSED(a), int UNUSED(b), void *
bu_clbk_t f = NULL;
void *d = NULL;
int flag = 1;
rt_solid_edit_clbk_get(&f, &d, s, ECMD_EAXES_POS, 0, GED_CLBK_DURING);
rt_solid_edit_clbk_get(&f, &d, s, ECMD_EAXES_POS, 0, BU_CLBK_DURING);
if (f)
(*f)(0, NULL, d, &flag);
}
Expand Down Expand Up @@ -162,7 +161,7 @@ arb6_edge(struct rt_solid_edit *s, int arg, int UNUSED(a), int UNUSED(b), void *
bu_clbk_t f = NULL;
void *d = NULL;
int flag = 1;
rt_solid_edit_clbk_get(&f, &d, s, ECMD_EAXES_POS, 0, GED_CLBK_DURING);
rt_solid_edit_clbk_get(&f, &d, s, ECMD_EAXES_POS, 0, BU_CLBK_DURING);
if (f)
(*f)(0, NULL, d, &flag);
}
Expand Down Expand Up @@ -204,7 +203,7 @@ arb5_edge(struct rt_solid_edit *s, int arg, int UNUSED(a), int UNUSED(b), void *
bu_clbk_t f = NULL;
void *d = NULL;
int flag = 1;
rt_solid_edit_clbk_get(&f, &d, s, ECMD_EAXES_POS, 0, GED_CLBK_DURING);
rt_solid_edit_clbk_get(&f, &d, s, ECMD_EAXES_POS, 0, BU_CLBK_DURING);
if (f)
(*f)(0, NULL, d, &flag);
}
Expand Down Expand Up @@ -240,7 +239,7 @@ arb4_point(struct rt_solid_edit *s, int arg, int UNUSED(a), int UNUSED(b), void
bu_clbk_t f = NULL;
void *d = NULL;
int flag = 1;
rt_solid_edit_clbk_get(&f, &d, s, ECMD_EAXES_POS, 0, GED_CLBK_DURING);
rt_solid_edit_clbk_get(&f, &d, s, ECMD_EAXES_POS, 0, BU_CLBK_DURING);
if (f)
(*f)(0, NULL, d, &flag);
}
Expand Down Expand Up @@ -271,7 +270,7 @@ arb8_mv_face(struct rt_solid_edit *s, int arg, int UNUSED(a), int UNUSED(b), voi
bu_clbk_t f = NULL;
void *d = NULL;
int flag = 1;
rt_solid_edit_clbk_get(&f, &d, s, ECMD_EAXES_POS, 0, GED_CLBK_DURING);
rt_solid_edit_clbk_get(&f, &d, s, ECMD_EAXES_POS, 0, BU_CLBK_DURING);
if (f)
(*f)(0, NULL, d, &flag);
}
Expand Down Expand Up @@ -304,7 +303,7 @@ arb7_mv_face(struct rt_solid_edit *s, int arg, int UNUSED(a), int UNUSED(b), voi
bu_clbk_t f = NULL;
void *d = NULL;
int flag = 1;
rt_solid_edit_clbk_get(&f, &d, s, ECMD_EAXES_POS, 0, GED_CLBK_DURING);
rt_solid_edit_clbk_get(&f, &d, s, ECMD_EAXES_POS, 0, BU_CLBK_DURING);
if (f)
(*f)(0, NULL, d, &flag);
}
Expand Down Expand Up @@ -333,7 +332,7 @@ arb6_mv_face(struct rt_solid_edit *s, int arg, int UNUSED(a), int UNUSED(b), voi
bu_clbk_t f = NULL;
void *d = NULL;
int flag = 1;
rt_solid_edit_clbk_get(&f, &d, s, ECMD_EAXES_POS, 0, GED_CLBK_DURING);
rt_solid_edit_clbk_get(&f, &d, s, ECMD_EAXES_POS, 0, BU_CLBK_DURING);
if (f)
(*f)(0, NULL, d, &flag);
}
Expand Down Expand Up @@ -365,7 +364,7 @@ arb5_mv_face(struct rt_solid_edit *s, int arg, int UNUSED(a), int UNUSED(b), voi
bu_clbk_t f = NULL;
void *d = NULL;
int flag = 1;
rt_solid_edit_clbk_get(&f, &d, s, ECMD_EAXES_POS, 0, GED_CLBK_DURING);
rt_solid_edit_clbk_get(&f, &d, s, ECMD_EAXES_POS, 0, BU_CLBK_DURING);
if (f)
(*f)(0, NULL, d, &flag);
}
Expand Down Expand Up @@ -397,7 +396,7 @@ arb4_mv_face(struct rt_solid_edit *s, int arg, int UNUSED(a), int UNUSED(b), voi
bu_clbk_t f = NULL;
void *d = NULL;
int flag = 1;
rt_solid_edit_clbk_get(&f, &d, s, ECMD_EAXES_POS, 0, GED_CLBK_DURING);
rt_solid_edit_clbk_get(&f, &d, s, ECMD_EAXES_POS, 0, BU_CLBK_DURING);
if (f)
(*f)(0, NULL, d, &flag);
}
Expand Down Expand Up @@ -890,7 +889,7 @@ ecmd_arb_main_menu(struct rt_solid_edit *s)
rt_solid_edit_set_edflag(s, RT_SOLID_EDIT_IDLE);
bu_clbk_t f = NULL;
void *d = NULL;
rt_solid_edit_clbk_get(&f, &d, s, ECMD_MENU_SET, 0, GED_CLBK_DURING);
rt_solid_edit_clbk_get(&f, &d, s, ECMD_MENU_SET, 0, BU_CLBK_DURING);
if (!f)
return;
(*f)(0, NULL, d, cntrl_menu);
Expand All @@ -907,26 +906,26 @@ ecmd_arb_specific_menu(struct rt_solid_edit *s)
rt_solid_edit_set_edflag(s, RT_SOLID_EDIT_IDLE);
switch (s->edit_menu) {
case MENU_ARB_MV_EDGE:
rt_solid_edit_clbk_get(&f, &d, s, ECMD_MENU_SET, 0, GED_CLBK_DURING);
rt_solid_edit_clbk_get(&f, &d, s, ECMD_MENU_SET, 0, BU_CLBK_DURING);
if (!f)
return BRLCAD_ERROR;
(*f)(0, NULL, d, which_menu[arb_type-4]);
return BRLCAD_OK;
case MENU_ARB_MV_FACE:
rt_solid_edit_clbk_get(&f, &d, s, ECMD_MENU_SET, 0, GED_CLBK_DURING);
rt_solid_edit_clbk_get(&f, &d, s, ECMD_MENU_SET, 0, BU_CLBK_DURING);
if (!f)
return BRLCAD_ERROR;
(*f)(0, NULL, d, which_menu[arb_type+1]);
return BRLCAD_OK;
case MENU_ARB_ROT_FACE:
rt_solid_edit_clbk_get(&f, &d, s, ECMD_MENU_SET, 0, GED_CLBK_DURING);
rt_solid_edit_clbk_get(&f, &d, s, ECMD_MENU_SET, 0, BU_CLBK_DURING);
if (!f)
return BRLCAD_ERROR;
(*f)(0, NULL, d, which_menu[arb_type+6]);
return BRLCAD_OK;
default:
bu_vls_printf(s->log_str, "Bad menu item.\n");
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, GED_CLBK_DURING);
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, BU_CLBK_DURING);
if (f)
(*f)(0, NULL, d, NULL);
return BRLCAD_ERROR;
Expand Down Expand Up @@ -981,7 +980,7 @@ ecmd_arb_setup_rotface(struct rt_solid_edit *s)
struct rt_arb_internal *arb = (struct rt_arb_internal *)s->es_int.idb_ptr;
RT_ARB_CK_MAGIC(arb);

rt_solid_edit_clbk_get(&f, &d, s, ECMD_ARB_SETUP_ROTFACE, 0, GED_CLBK_DURING);
rt_solid_edit_clbk_get(&f, &d, s, ECMD_ARB_SETUP_ROTFACE, 0, BU_CLBK_DURING);
if (f)
fixv = (*f)(0, NULL, d, s);

Expand All @@ -995,13 +994,13 @@ ecmd_arb_setup_rotface(struct rt_solid_edit *s)
/* draw arrow, etc. */
int vs_flag = 1;
f = NULL; d = NULL;
rt_solid_edit_clbk_get(&f, &d, s, ECMD_VIEW_SET_FLAG, 0, GED_CLBK_DURING);
rt_solid_edit_clbk_get(&f, &d, s, ECMD_VIEW_SET_FLAG, 0, BU_CLBK_DURING);
if (f)
(*f)(0, NULL, d, &vs_flag);

/* eaxes */
int e_flag = 1;
rt_solid_edit_clbk_get(&f, &d, s, ECMD_EAXES_POS, 0, GED_CLBK_DURING);
rt_solid_edit_clbk_get(&f, &d, s, ECMD_EAXES_POS, 0, BU_CLBK_DURING);
if (f)
(*f)(0, NULL, d, &e_flag);
}
Expand Down Expand Up @@ -1078,7 +1077,7 @@ ecmd_arb_rotate_face(struct rt_solid_edit *s)
} else {
bu_vls_printf(s->log_str, "Must be < rot fb | xdeg ydeg zdeg >\n");
f = NULL; d = NULL;
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, GED_CLBK_DURING);
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, BU_CLBK_DURING);
if (f)
(*f)(0, NULL, d, NULL);
return BRLCAD_ERROR;
Expand Down Expand Up @@ -1118,7 +1117,7 @@ ecmd_arb_rotate_face(struct rt_solid_edit *s)

/* no need to calc_planes again */
f = NULL; d = NULL;
rt_solid_edit_clbk_get(&f, &d, s, ECMD_REPLOT_EDITING_SOLID, 0, GED_CLBK_DURING);
rt_solid_edit_clbk_get(&f, &d, s, ECMD_REPLOT_EDITING_SOLID, 0, BU_CLBK_DURING);
if (f)
(*f)(0, NULL, d, NULL);

Expand Down Expand Up @@ -1308,7 +1307,7 @@ rt_solid_edit_arb_edit_xy(
break;
default:
bu_vls_printf(s->log_str, "%s: XY edit undefined in solid edit mode %d\n", EDOBJ[ip->idb_type].ft_label, edflag);
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, GED_CLBK_DURING);
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, BU_CLBK_DURING);
if (f)
(*f)(0, NULL, d, NULL);
return BRLCAD_ERROR;
Expand Down
25 changes: 12 additions & 13 deletions src/mged/primitives/edars.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
#include "raytrace.h"
#include "rt/geom.h"
#include "wdb.h"
#include "ged/defines.h"

#include "./edfunctab.h"

Expand Down Expand Up @@ -301,7 +300,7 @@ ecmd_ars_pick(struct rt_solid_edit *s)
}
} else if (s->e_inpara && s->e_inpara != 3) {
bu_vls_printf(s->log_str, "x y z coordinates required for 'pick point'\n");
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, GED_CLBK_DURING);
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, BU_CLBK_DURING);
if (f)
(*f)(0, NULL, d, NULL);
return;
Expand All @@ -319,7 +318,7 @@ ecmd_ars_pick(struct rt_solid_edit *s)

bu_vls_printf(&tmp_vls, "Selected point #%d from curve #%d (%f %f %f)\n", a->es_ars_col, a->es_ars_crv, V3ARGS(selected_pt));
bu_vls_printf(s->log_str, "%s", bu_vls_cstr(&tmp_vls));
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, GED_CLBK_DURING);
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, BU_CLBK_DURING);
if (f)
(*f)(0, NULL, d, NULL);
bu_vls_free(&tmp_vls);
Expand Down Expand Up @@ -349,7 +348,7 @@ ecmd_ars_next_pt(struct rt_solid_edit *s)

bu_vls_printf(&tmp_vls, "Selected point #%d from curve #%d (%f %f %f)\n", a->es_ars_col, a->es_ars_crv, V3ARGS(selected_pt));
bu_vls_printf(s->log_str, "%s", bu_vls_cstr(&tmp_vls));
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, GED_CLBK_DURING);
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, BU_CLBK_DURING);
if (f)
(*f)(0, NULL, d, NULL);
bu_vls_free(&tmp_vls);
Expand Down Expand Up @@ -380,7 +379,7 @@ ecmd_ars_prev_pt(struct rt_solid_edit *s)

bu_vls_printf(&tmp_vls, "Selected point #%d from curve #%d (%f %f %f)\n", a->es_ars_col, a->es_ars_crv, V3ARGS(selected_pt));
bu_vls_printf(s->log_str, "%s", bu_vls_cstr(&tmp_vls));
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, GED_CLBK_DURING);
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, BU_CLBK_DURING);
if (f)
(*f)(0, NULL, d, NULL);
bu_vls_free(&tmp_vls);
Expand Down Expand Up @@ -411,7 +410,7 @@ ecmd_ars_next_crv(struct rt_solid_edit *s)

bu_vls_printf(&tmp_vls, "Selected point #%d from curve #%d (%f %f %f)\n", a->es_ars_col, a->es_ars_crv, V3ARGS(selected_pt));
bu_vls_printf(s->log_str, "%s", bu_vls_cstr(&tmp_vls));
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, GED_CLBK_DURING);
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, BU_CLBK_DURING);
if (f)
(*f)(0, NULL, d, NULL);
bu_vls_free(&tmp_vls);
Expand Down Expand Up @@ -442,7 +441,7 @@ ecmd_ars_prev_crv(struct rt_solid_edit *s)

bu_vls_printf(&tmp_vls, "Selected point #%d from curve #%d (%f %f %f)\n", a->es_ars_col, a->es_ars_crv, V3ARGS(selected_pt));
bu_vls_printf(s->log_str, "%s", bu_vls_cstr(&tmp_vls));
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, GED_CLBK_DURING);
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, BU_CLBK_DURING);
if (f)
(*f)(0, NULL, d, NULL);
bu_vls_free(&tmp_vls);
Expand Down Expand Up @@ -691,7 +690,7 @@ ecmd_ars_move_col(struct rt_solid_edit *s)
}
} else if (s->e_inpara && s->e_inpara != 3) {
bu_vls_printf(s->log_str, "x y z coordinates required for point movement\n");
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, GED_CLBK_DURING);
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, BU_CLBK_DURING);
if (f)
(*f)(0, NULL, d, NULL);
return;
Expand Down Expand Up @@ -755,7 +754,7 @@ ecmd_ars_move_crv(struct rt_solid_edit *s)
}
} else if (s->e_inpara && s->e_inpara != 3) {
bu_vls_printf(s->log_str, "x y z coordinates required for point movement\n");
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, GED_CLBK_DURING);
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, BU_CLBK_DURING);
if (f)
(*f)(0, NULL, d, NULL);
return;
Expand Down Expand Up @@ -818,7 +817,7 @@ ecmd_ars_move_pt(struct rt_solid_edit *s)
}
} else if (s->e_inpara && s->e_inpara != 3) {
bu_vls_printf(s->log_str, "x y z coordinates required for point movement\n");
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, GED_CLBK_DURING);
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, BU_CLBK_DURING);
if (f)
(*f)(0, NULL, d, NULL);
return;
Expand Down Expand Up @@ -854,15 +853,15 @@ rt_solid_edit_ars_edit(struct rt_solid_edit *s, int edflag)
s->solid_edit_translate = 0;
s->solid_edit_scale = 0;
s->solid_edit_pick = 1;
rt_solid_edit_clbk_get(&f, &d, s, ECMD_MENU_SET, 0, GED_CLBK_DURING);
rt_solid_edit_clbk_get(&f, &d, s, ECMD_MENU_SET, 0, BU_CLBK_DURING);
if (!f)
return 0;
(*f)(0, NULL, d, ars_pick_menu);
break;
case ECMD_ARS_EDIT_MENU:
/* put up main ARS edit menu */
rt_solid_edit_set_edflag(s, RT_SOLID_EDIT_IDLE);
rt_solid_edit_clbk_get(&f, &d, s, ECMD_MENU_SET, 0, GED_CLBK_DURING);
rt_solid_edit_clbk_get(&f, &d, s, ECMD_MENU_SET, 0, BU_CLBK_DURING);
if (!f)
return 0;
(*f)(0, NULL, d, ars_menu);
Expand Down Expand Up @@ -943,7 +942,7 @@ rt_solid_edit_ars_edit_xy(
break;
default:
bu_vls_printf(s->log_str, "%s: XY edit undefined in solid edit mode %d\n", EDOBJ[ip->idb_type].ft_label, edflag);
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, GED_CLBK_DURING);
rt_solid_edit_clbk_get(&f, &d, s, ECMD_PRINT_RESULTS, 0, BU_CLBK_DURING);
if (f)
(*f)(0, NULL, d, NULL);
return BRLCAD_ERROR;
Expand Down
Loading

0 comments on commit 1857da8

Please sign in to comment.