diff options
Diffstat (limited to 'source/blender/windowmanager/gizmo')
3 files changed, 21 insertions, 21 deletions
diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo.c index 6abc37a893f..123857f3251 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo.c +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo.c @@ -258,19 +258,19 @@ PointerRNA *WM_gizmo_operator_set( gz->op_data_len = part_index + 1; gz->op_data = MEM_recallocN(gz->op_data, sizeof(*gz->op_data) * gz->op_data_len); } - wmGizmoOpElem *mpop = &gz->op_data[part_index]; - mpop->type = ot; + wmGizmoOpElem *gzop = &gz->op_data[part_index]; + gzop->type = ot; - if (mpop->ptr.data) { - WM_operator_properties_free(&mpop->ptr); + if (gzop->ptr.data) { + WM_operator_properties_free(&gzop->ptr); } - WM_operator_properties_create_ptr(&mpop->ptr, ot); + WM_operator_properties_create_ptr(&gzop->ptr, ot); if (properties) { - mpop->ptr.data = properties; + gzop->ptr.data = properties; } - return &mpop->ptr; + return &gzop->ptr; } static void wm_gizmo_set_matrix_rotation_from_z_axis__internal( diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c index f4cb40b0b94..9cc8bacd20b 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c @@ -351,20 +351,20 @@ static bool gizmo_tweak_start( static bool gizmo_tweak_start_and_finish( bContext *C, wmGizmoMap *gzmap, wmGizmo *gz, const wmEvent *event, bool *r_is_modal) { - wmGizmoOpElem *mpop = WM_gizmo_operator_get(gz, gz->highlight_part); + wmGizmoOpElem *gzop = WM_gizmo_operator_get(gz, gz->highlight_part); if (r_is_modal) { *r_is_modal = false; } - if (mpop && mpop->type) { + if (gzop && gzop->type) { /* Undo/Redo */ - if (mpop->is_redo) { + if (gzop->is_redo) { wmWindowManager *wm = CTX_wm_manager(C); wmOperator *op = WM_operator_last_redo(C); /* We may want to enable this, for now the gizmo can manage it's own properties. */ #if 0 - IDP_MergeGroup(mpop->ptr.data, op->properties, false); + IDP_MergeGroup(gzop->ptr.data, op->properties, false); #endif WM_operator_free_all_after(wm, op); @@ -373,7 +373,7 @@ static bool gizmo_tweak_start_and_finish( /* XXX temporary workaround for modal gizmo operator * conflicting with modal operator attached to gizmo */ - if (mpop->type->modal) { + if (gzop->type->modal) { /* activate highlighted gizmo */ wm_gizmomap_modal_set(gzmap, C, gz, event, true); if (r_is_modal) { @@ -385,7 +385,7 @@ static bool gizmo_tweak_start_and_finish( gz->parent_gzgroup->type->invoke_prepare(C, gz->parent_gzgroup, gz); } /* Allow for 'button' gizmos, single click to run an action. */ - WM_operator_name_call_ptr(C, mpop->type, WM_OP_INVOKE_DEFAULT, &mpop->ptr); + WM_operator_name_call_ptr(C, gzop->type, WM_OP_INVOKE_DEFAULT, &gzop->ptr); } return true; } @@ -548,9 +548,9 @@ static int gizmo_tweak_invoke(bContext *C, wmOperator *op, const wmEvent *event) bool use_drag_detect = false; #ifdef USE_DRAG_DETECT if (use_drag_fallback) { - wmGizmoOpElem *mpop = WM_gizmo_operator_get(gz, gz->highlight_part); - if (mpop && mpop->type) { - if (mpop->type->modal == NULL) { + wmGizmoOpElem *gzop = WM_gizmo_operator_get(gz, gz->highlight_part); + if (gzop && gzop->type) { + if (gzop->type->modal == NULL) { use_drag_detect = true; } } diff --git a/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c b/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c index 2c52b06a32a..ede0f7c96ea 100644 --- a/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c +++ b/source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c @@ -718,8 +718,8 @@ void wm_gizmomaps_handled_modal_update( /* regular update for running operator */ if (modal_running) { - wmGizmoOpElem *mpop = gz ? WM_gizmo_operator_get(gz, gz->highlight_part) : NULL; - if (gz && mpop && (mpop->type != NULL) && (mpop->type == handler->op->type)) { + wmGizmoOpElem *gzop = gz ? WM_gizmo_operator_get(gz, gz->highlight_part) : NULL; + if (gz && gzop && (gzop->type != NULL) && (gzop->type == handler->op->type)) { wmGizmoFnModal modal_fn = gz->custom_modal ? gz->custom_modal : gz->type->modal; if (modal_fn != NULL) { int retval = modal_fn(C, gz, event, 0); @@ -971,9 +971,9 @@ void wm_gizmomap_modal_set( gzmap->gzmap_context.event_xy[0] = INT_MAX; } - struct wmGizmoOpElem *mpop = WM_gizmo_operator_get(gz, gz->highlight_part); - if (mpop && mpop->type) { - const int retval = WM_operator_name_call_ptr(C, mpop->type, WM_OP_INVOKE_DEFAULT, &mpop->ptr); + struct wmGizmoOpElem *gzop = WM_gizmo_operator_get(gz, gz->highlight_part); + if (gzop && gzop->type) { + const int retval = WM_operator_name_call_ptr(C, gzop->type, WM_OP_INVOKE_DEFAULT, &gzop->ptr); if ((retval & OPERATOR_RUNNING_MODAL) == 0) { wm_gizmomap_modal_set(gzmap, C, gz, event, false); } |