archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: naming

Browse Source 
'mp' was a reference to 'manipulator'
This commit is contained in:
Campbell Barton
2018-10-16 22:08:43 +11:00
parent 48034f0eb3
commit 3f3eae675a
8 changed files with 62 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/editors/interface/interface_region_tooltip.c
View File

@@ -872,7 +872,7 @@ static uiTooltipData *ui_tooltip_data_from_gizmo(bContext *C, wmGizmo *gz)
const struct { const struct {
int part; int part;
const char *prefix; const char *prefix;
} mpop_actions[] = { } gzop_actions[] = {
{ {
.part = gz->highlight_part, .part = gz->highlight_part,
.prefix = use_drag ? TIP_("Click") : NULL, .prefix = use_drag ? TIP_("Click") : NULL,
@@ -882,19 +882,19 @@ static uiTooltipData *ui_tooltip_data_from_gizmo(bContext *C, wmGizmo *gz)
}, },
}; };
for (int i = 0; i < ARRAY_SIZE(mpop_actions); i++) { for (int i = 0; i < ARRAY_SIZE(gzop_actions); i++) {
wmGizmoOpElem *mpop = (mpop_actions[i].part != -1) ? WM_gizmo_operator_get(gz, mpop_actions[i].part) : NULL; wmGizmoOpElem *gzop = (gzop_actions[i].part != -1) ? WM_gizmo_operator_get(gz, gzop_actions[i].part) : NULL;
if (mpop != NULL) { if (gzop != NULL) {
/* Description */ /* Description */
const char *info = RNA_struct_ui_description(mpop->type->srna); const char *info = RNA_struct_ui_description(gzop->type->srna);
if (!(info && info[0])) { if (!(info && info[0])) {
info = RNA_struct_ui_name(mpop->type->srna); info = RNA_struct_ui_name(gzop->type->srna);
} }
if (info && info[0]) { if (info && info[0]) {
char *text = NULL; char *text = NULL;
if (mpop_actions[i].prefix != NULL) { if (gzop_actions[i].prefix != NULL) {
text = BLI_sprintfN("%s: %s", mpop_actions[i].prefix, info); text = BLI_sprintfN("%s: %s", gzop_actions[i].prefix, info);
} }
else { else {
text = BLI_strdup(info); text = BLI_strdup(info);
@@ -914,10 +914,10 @@ static uiTooltipData *ui_tooltip_data_from_gizmo(bContext *C, wmGizmo *gz)
/* Shortcut */ /* Shortcut */
{ {
bool found = false; bool found = false;
IDProperty *prop = mpop->ptr.data; IDProperty *prop = gzop->ptr.data;
char buf[128]; char buf[128];
if (WM_key_event_operator_string( if (WM_key_event_operator_string(
C, mpop->type->idname, WM_OP_INVOKE_DEFAULT, prop, true, C, gzop->type->idname, WM_OP_INVOKE_DEFAULT, prop, true,
buf, ARRAY_SIZE(buf))) buf, ARRAY_SIZE(buf)))
{ {
found = true; found = true;

12
source/blender/editors/mesh/editmesh_extrude_gizmo.c
View File

@@ -187,8 +187,8 @@ static void gizmo_mesh_extrude_setup(const bContext *UNUSED(C), wmGizmoGroup *gz
RNA_boolean_set(&macroptr, "release_confirm", true); RNA_boolean_set(&macroptr, "release_confirm", true);
RNA_boolean_set_array(&macroptr, "constraint_axis", constraint); RNA_boolean_set_array(&macroptr, "constraint_axis", constraint);
} }
wmGizmoOpElem *mpop = WM_gizmo_operator_get(ggd->adjust_xyz_no[i], 0); wmGizmoOpElem *gzop = WM_gizmo_operator_get(ggd->adjust_xyz_no[i], 0);
mpop->is_redo = true; gzop->is_redo = true;
} }
} }
@@ -280,8 +280,8 @@ static void gizmo_mesh_extrude_refresh(const bContext *C, wmGizmoGroup *gzgroup)
/* Operator properties. */ /* Operator properties. */
if (use_normal) { if (use_normal) {
wmGizmoOpElem *mpop = WM_gizmo_operator_get(ggd->invoke_xyz_no[3], 0); wmGizmoOpElem *gzop = WM_gizmo_operator_get(ggd->invoke_xyz_no[3], 0);
PointerRNA macroptr = RNA_pointer_get(&mpop->ptr, "TRANSFORM_OT_translate"); PointerRNA macroptr = RNA_pointer_get(&gzop->ptr, "TRANSFORM_OT_translate");
RNA_enum_set(&macroptr, "constraint_orientation", V3D_MANIP_NORMAL); RNA_enum_set(&macroptr, "constraint_orientation", V3D_MANIP_NORMAL);
} }
@@ -300,9 +300,9 @@ static void gizmo_mesh_extrude_refresh(const bContext *C, wmGizmoGroup *gzgroup)
(orientation_type == ggd->data.orientation_type && constraint_axis[i]) : (orientation_type == ggd->data.orientation_type && constraint_axis[i]) :
(orientation_type == V3D_MANIP_NORMAL && constraint_axis[2])) (orientation_type == V3D_MANIP_NORMAL && constraint_axis[2]))
{ {
wmGizmoOpElem *mpop = WM_gizmo_operator_get(ggd->adjust_xyz_no[i], 0); wmGizmoOpElem *gzop = WM_gizmo_operator_get(ggd->adjust_xyz_no[i], 0);
PointerRNA macroptr = RNA_pointer_get(&mpop->ptr, "TRANSFORM_OT_translate"); PointerRNA macroptr = RNA_pointer_get(&gzop->ptr, "TRANSFORM_OT_translate");
RNA_float_set_array(&macroptr, "value", value); RNA_float_set_array(&macroptr, "value", value);
RNA_boolean_set_array(&macroptr, "constraint_axis", constraint_axis); RNA_boolean_set_array(&macroptr, "constraint_axis", constraint_axis);

4
source/blender/editors/space_view3d/view3d_gizmo_navigate.c
View File

@@ -192,8 +192,8 @@ static void WIDGETGROUP_navigate_setup(const bContext *UNUSED(C), wmGizmoGroup *
int gz_ids[] = {MPR_MOVE, MPR_ROTATE, MPR_ZOOM}; int gz_ids[] = {MPR_MOVE, MPR_ROTATE, MPR_ZOOM};
for (int i = 0; i < ARRAY_SIZE(gz_ids); i++) { for (int i = 0; i < ARRAY_SIZE(gz_ids); i++) {
wmGizmo *gz = navgroup->gz_array[gz_ids[i]]; wmGizmo *gz = navgroup->gz_array[gz_ids[i]];
wmGizmoOpElem *mpop = WM_gizmo_operator_get(gz, 0); wmGizmoOpElem *gzop = WM_gizmo_operator_get(gz, 0);
RNA_boolean_set(&mpop->ptr, "use_mouse_init", false); RNA_boolean_set(&gzop->ptr, "use_mouse_init", false);
} }
} }

40
source/blender/editors/transform/transform_gizmo_2d.c
View File

@@ -303,33 +303,33 @@ void ED_widgetgroup_gizmo2d_refresh(const bContext *C, wmGizmoGroup *gzgroup)
} }
if (show_cage) { if (show_cage) {
wmGizmoOpElem *mpop; wmGizmoOpElem *gzop;
float mid[2]; float mid[2];
const float *min = ggd->min; const float *min = ggd->min;
const float *max = ggd->max; const float *max = ggd->max;
mid_v2_v2v2(mid, min, max); mid_v2_v2v2(mid, min, max);
mpop = WM_gizmo_operator_get(ggd->cage, ED_GIZMO_CAGE2D_PART_SCALE_MIN_X); gzop = WM_gizmo_operator_get(ggd->cage, ED_GIZMO_CAGE2D_PART_SCALE_MIN_X);
PropertyRNA *prop_center_override = RNA_struct_find_property(&mpop->ptr, "center_override"); PropertyRNA *prop_center_override = RNA_struct_find_property(&gzop->ptr, "center_override");
RNA_property_float_set_array(&mpop->ptr, prop_center_override, (float[3]){max[0], mid[1], 0.0f}); RNA_property_float_set_array(&gzop->ptr, prop_center_override, (float[3]){max[0], mid[1], 0.0f});
mpop = WM_gizmo_operator_get(ggd->cage, ED_GIZMO_CAGE2D_PART_SCALE_MAX_X); gzop = WM_gizmo_operator_get(ggd->cage, ED_GIZMO_CAGE2D_PART_SCALE_MAX_X);
RNA_property_float_set_array(&mpop->ptr, prop_center_override, (float[3]){min[0], mid[1], 0.0f}); RNA_property_float_set_array(&gzop->ptr, prop_center_override, (float[3]){min[0], mid[1], 0.0f});
mpop = WM_gizmo_operator_get(ggd->cage, ED_GIZMO_CAGE2D_PART_SCALE_MIN_Y); gzop = WM_gizmo_operator_get(ggd->cage, ED_GIZMO_CAGE2D_PART_SCALE_MIN_Y);
RNA_property_float_set_array(&mpop->ptr, prop_center_override, (float[3]){mid[0], max[1], 0.0f}); RNA_property_float_set_array(&gzop->ptr, prop_center_override, (float[3]){mid[0], max[1], 0.0f});
mpop = WM_gizmo_operator_get(ggd->cage, ED_GIZMO_CAGE2D_PART_SCALE_MAX_Y); gzop = WM_gizmo_operator_get(ggd->cage, ED_GIZMO_CAGE2D_PART_SCALE_MAX_Y);
RNA_property_float_set_array(&mpop->ptr, prop_center_override, (float[3]){mid[0], min[1], 0.0f}); RNA_property_float_set_array(&gzop->ptr, prop_center_override, (float[3]){mid[0], min[1], 0.0f});
mpop = WM_gizmo_operator_get(ggd->cage, ED_GIZMO_CAGE2D_PART_SCALE_MIN_X_MIN_Y); gzop = WM_gizmo_operator_get(ggd->cage, ED_GIZMO_CAGE2D_PART_SCALE_MIN_X_MIN_Y);
RNA_property_float_set_array(&mpop->ptr, prop_center_override, (float[3]){max[0], max[1], 0.0f}); RNA_property_float_set_array(&gzop->ptr, prop_center_override, (float[3]){max[0], max[1], 0.0f});
mpop = WM_gizmo_operator_get(ggd->cage, ED_GIZMO_CAGE2D_PART_SCALE_MIN_X_MAX_Y); gzop = WM_gizmo_operator_get(ggd->cage, ED_GIZMO_CAGE2D_PART_SCALE_MIN_X_MAX_Y);
RNA_property_float_set_array(&mpop->ptr, prop_center_override, (float[3]){max[0], min[1], 0.0f}); RNA_property_float_set_array(&gzop->ptr, prop_center_override, (float[3]){max[0], min[1], 0.0f});
mpop = WM_gizmo_operator_get(ggd->cage, ED_GIZMO_CAGE2D_PART_SCALE_MAX_X_MIN_Y); gzop = WM_gizmo_operator_get(ggd->cage, ED_GIZMO_CAGE2D_PART_SCALE_MAX_X_MIN_Y);
RNA_property_float_set_array(&mpop->ptr, prop_center_override, (float[3]){min[0], max[1], 0.0f}); RNA_property_float_set_array(&gzop->ptr, prop_center_override, (float[3]){min[0], max[1], 0.0f});
mpop = WM_gizmo_operator_get(ggd->cage, ED_GIZMO_CAGE2D_PART_SCALE_MAX_X_MAX_Y); gzop = WM_gizmo_operator_get(ggd->cage, ED_GIZMO_CAGE2D_PART_SCALE_MAX_X_MAX_Y);
RNA_property_float_set_array(&mpop->ptr, prop_center_override, (float[3]){min[0], min[1], 0.0f}); RNA_property_float_set_array(&gzop->ptr, prop_center_override, (float[3]){min[0], min[1], 0.0f});
mpop = WM_gizmo_operator_get(ggd->cage, ED_GIZMO_CAGE2D_PART_ROTATE); gzop = WM_gizmo_operator_get(ggd->cage, ED_GIZMO_CAGE2D_PART_ROTATE);
RNA_property_float_set_array(&mpop->ptr, prop_center_override, (float[3]){mid[0], mid[1], 0.0f}); RNA_property_float_set_array(&gzop->ptr, prop_center_override, (float[3]){mid[0], mid[1], 0.0f});
} }
} }

6
source/blender/editors/transform/transform_gizmo_3d.c
View File

@@ -1919,12 +1919,12 @@ static void WIDGETGROUP_xform_cage_refresh(const bContext *C, wmGizmoGroup *gzgr
center[1] = (float)(1 - y) * dims[1]; center[1] = (float)(1 - y) * dims[1];
for (int z = 0; z < 3; z++) { for (int z = 0; z < 3; z++) {
center[2] = (float)(1 - z) * dims[2]; center[2] = (float)(1 - z) * dims[2];
struct wmGizmoOpElem *mpop = WM_gizmo_operator_get(gz, i); struct wmGizmoOpElem *gzop = WM_gizmo_operator_get(gz, i);
if (prop_center_override == NULL) { if (prop_center_override == NULL) {
prop_center_override = RNA_struct_find_property(&mpop->ptr, "center_override"); prop_center_override = RNA_struct_find_property(&gzop->ptr, "center_override");
} }
mul_v3_m4v3(center_global, matrix_offset_global, center); mul_v3_m4v3(center_global, matrix_offset_global, center);
RNA_property_float_set_array(&mpop->ptr, prop_center_override, center_global); RNA_property_float_set_array(&gzop->ptr, prop_center_override, center_global);
i++; i++;
} }
} }

14
source/blender/windowmanager/gizmo/intern/wm_gizmo.c
View File

@@ -258,19 +258,19 @@ PointerRNA *WM_gizmo_operator_set(
gz->op_data_len = part_index + 1; gz->op_data_len = part_index + 1;
gz->op_data = MEM_recallocN(gz->op_data, sizeof(*gz->op_data) * gz->op_data_len); gz->op_data = MEM_recallocN(gz->op_data, sizeof(*gz->op_data) * gz->op_data_len);
} }
wmGizmoOpElem *mpop = &gz->op_data[part_index]; wmGizmoOpElem *gzop = &gz->op_data[part_index];
mpop->type = ot; gzop->type = ot;
if (mpop->ptr.data) { if (gzop->ptr.data) {
WM_operator_properties_free(&mpop->ptr); WM_operator_properties_free(&gzop->ptr);
} }
WM_operator_properties_create_ptr(&mpop->ptr, ot); WM_operator_properties_create_ptr(&gzop->ptr, ot);
if (properties) { 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( static void wm_gizmo_set_matrix_rotation_from_z_axis__internal(

18
source/blender/windowmanager/gizmo/intern/wm_gizmo_group.c
View File

@@ -351,20 +351,20 @@ static bool gizmo_tweak_start(
static bool gizmo_tweak_start_and_finish( static bool gizmo_tweak_start_and_finish(
bContext *C, wmGizmoMap *gzmap, wmGizmo *gz, const wmEvent *event, bool *r_is_modal) 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) { if (r_is_modal) {
*r_is_modal = false; *r_is_modal = false;
} }
if (mpop && mpop->type) { if (gzop && gzop->type) {
/* Undo/Redo */ /* Undo/Redo */
if (mpop->is_redo) { if (gzop->is_redo) {
wmWindowManager *wm = CTX_wm_manager(C); wmWindowManager *wm = CTX_wm_manager(C);
wmOperator *op = WM_operator_last_redo(C); wmOperator *op = WM_operator_last_redo(C);
/* We may want to enable this, for now the gizmo can manage it's own properties. */ /* We may want to enable this, for now the gizmo can manage it's own properties. */
#if 0 #if 0
IDP_MergeGroup(mpop->ptr.data, op->properties, false); IDP_MergeGroup(gzop->ptr.data, op->properties, false);
#endif #endif
WM_operator_free_all_after(wm, op); 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 /* XXX temporary workaround for modal gizmo operator
* conflicting with modal operator attached to gizmo */ * conflicting with modal operator attached to gizmo */
if (mpop->type->modal) { if (gzop->type->modal) {
/* activate highlighted gizmo */ /* activate highlighted gizmo */
wm_gizmomap_modal_set(gzmap, C, gz, event, true); wm_gizmomap_modal_set(gzmap, C, gz, event, true);
if (r_is_modal) { 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); gz->parent_gzgroup->type->invoke_prepare(C, gz->parent_gzgroup, gz);
} }
/* Allow for 'button' gizmos, single click to run an action. */ /* 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; return true;
} }
@@ -548,9 +548,9 @@ static int gizmo_tweak_invoke(bContext *C, wmOperator *op, const wmEvent *event)
bool use_drag_detect = false; bool use_drag_detect = false;
#ifdef USE_DRAG_DETECT #ifdef USE_DRAG_DETECT
if (use_drag_fallback) { if (use_drag_fallback) {
wmGizmoOpElem *mpop = WM_gizmo_operator_get(gz, gz->highlight_part); wmGizmoOpElem *gzop = WM_gizmo_operator_get(gz, gz->highlight_part);
if (mpop && mpop->type) { if (gzop && gzop->type) {
if (mpop->type->modal == NULL) { if (gzop->type->modal == NULL) {
use_drag_detect = true; use_drag_detect = true;
} }
} }

10
source/blender/windowmanager/gizmo/intern/wm_gizmo_map.c
View File

@@ -718,8 +718,8 @@ void wm_gizmomaps_handled_modal_update(
/* regular update for running operator */ /* regular update for running operator */
if (modal_running) { if (modal_running) {
wmGizmoOpElem *mpop = gz ? WM_gizmo_operator_get(gz, gz->highlight_part) : NULL; wmGizmoOpElem *gzop = gz ? WM_gizmo_operator_get(gz, gz->highlight_part) : NULL;
if (gz && mpop && (mpop->type != NULL) && (mpop->type == handler->op->type)) { if (gz && gzop && (gzop->type != NULL) && (gzop->type == handler->op->type)) {
wmGizmoFnModal modal_fn = gz->custom_modal ? gz->custom_modal : gz->type->modal; wmGizmoFnModal modal_fn = gz->custom_modal ? gz->custom_modal : gz->type->modal;
if (modal_fn != NULL) { if (modal_fn != NULL) {
int retval = modal_fn(C, gz, event, 0); 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; gzmap->gzmap_context.event_xy[0] = INT_MAX;
} }
struct wmGizmoOpElem *mpop = WM_gizmo_operator_get(gz, gz->highlight_part); struct wmGizmoOpElem *gzop = WM_gizmo_operator_get(gz, gz->highlight_part);
if (mpop && mpop->type) { if (gzop && gzop->type) {
const int retval = WM_operator_name_call_ptr(C, mpop->type, WM_OP_INVOKE_DEFAULT, &mpop->ptr); const int retval = WM_operator_name_call_ptr(C, gzop->type, WM_OP_INVOKE_DEFAULT, &gzop->ptr);
if ((retval & OPERATOR_RUNNING_MODAL) == 0) { if ((retval & OPERATOR_RUNNING_MODAL) == 0) {
wm_gizmomap_modal_set(gzmap, C, gz, event, false); wm_gizmomap_modal_set(gzmap, C, gz, event, false);
} }