Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2021-10-21 05:24:17 +0300
committerCampbell Barton <ideasman42@gmail.com>2021-10-21 05:24:17 +0300
commit035dcdad90ec9d6881e2d99b90e30f5a481237e1 (patch)
treef4b0c0bf97fee7ed9813f9b5587b03af180251e9 /source/blender/editors
parent69102786047dccdcbaee0df6307a8c3364d28fe0 (diff)
Cleanup: use underscore separators for event struct members
Improve readability using underscores for separators, e.g. prev_click_time instead of prevclicktime.
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/interface/interface.c2
-rw-r--r--source/blender/editors/interface/interface_handlers.c2
-rw-r--r--source/blender/editors/mesh/editmesh_knife.c4
-rw-r--r--source/blender/editors/screen/screen_ops.c2
-rw-r--r--source/blender/editors/sculpt_paint/sculpt_mask_expand.c8
-rw-r--r--source/blender/editors/transform/transform.c8
6 files changed, 13 insertions, 13 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c
index fe4caf03184..5068969946a 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -7013,7 +7013,7 @@ void UI_but_focus_on_enter_event(wmWindow *win, uiBut *but)
event.val = KM_PRESS;
event.is_repeat = false;
event.customdata = but;
- event.customdatafree = false;
+ event.customdata_free = false;
wm_event_add(win, &event);
}
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index 243ebe4e75c..556474f6df4 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -9034,7 +9034,7 @@ void ui_but_activate_event(bContext *C, ARegion *region, uiBut *but)
event.val = KM_PRESS;
event.is_repeat = false;
event.customdata = but;
- event.customdatafree = false;
+ event.customdata_free = false;
ui_do_button(C, but->block, but, &event);
}
diff --git a/source/blender/editors/mesh/editmesh_knife.c b/source/blender/editors/mesh/editmesh_knife.c
index 036a2d9582f..d073f5f2ba4 100644
--- a/source/blender/editors/mesh/editmesh_knife.c
+++ b/source/blender/editors/mesh/editmesh_knife.c
@@ -4515,7 +4515,7 @@ static int knifetool_modal(bContext *C, wmOperator *op, const wmEvent *event)
knife_recalc_ortho(kcd);
/* Get the value of the event which triggered this one. */
- if (event->prevval != KM_RELEASE) {
+ if (event->prev_val != KM_RELEASE) {
if (kcd->mode == MODE_DRAGGING) {
knife_add_cut(kcd);
}
@@ -4754,7 +4754,7 @@ static int knifetool_invoke(bContext *C, wmOperator *op, const wmEvent *event)
if (wait_for_input == false) {
/* Avoid copy-paste logic. */
wmEvent event_modal = {
- .prevval = KM_NOTHING,
+ .prev_val = KM_NOTHING,
.type = EVT_MODAL_MAP,
.val = KNF_MODAL_ADD_CUT,
};
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index 861c2573de8..80ad35b8d8f 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -1051,7 +1051,7 @@ static void actionzone_apply(bContext *C, wmOperator *op, int type)
event.val = KM_NOTHING;
event.is_repeat = false;
event.customdata = op->customdata;
- event.customdatafree = true;
+ event.customdata_free = true;
op->customdata = NULL;
wm_event_add(win, &event);
diff --git a/source/blender/editors/sculpt_paint/sculpt_mask_expand.c b/source/blender/editors/sculpt_paint/sculpt_mask_expand.c
index 9b06b2ee5d5..b59d461bab5 100644
--- a/source/blender/editors/sculpt_paint/sculpt_mask_expand.c
+++ b/source/blender/editors/sculpt_paint/sculpt_mask_expand.c
@@ -170,10 +170,10 @@ static int sculpt_mask_expand_modal(bContext *C, wmOperator *op, const wmEvent *
SculptSession *ss = ob->sculpt;
Sculpt *sd = CTX_data_tool_settings(C)->sculpt;
ARegion *region = CTX_wm_region(C);
- float prevclick_f[2];
- copy_v2_v2(prevclick_f, op->customdata);
- const int prevclick[2] = {(int)prevclick_f[0], (int)prevclick_f[1]};
- int len = (int)len_v2v2_int(prevclick, event->mval);
+ float prev_click_f[2];
+ copy_v2_v2(prev_click_f, op->customdata);
+ const int prev_click[2] = {(int)prev_click_f[0], (int)prev_click_f[1]};
+ int len = (int)len_v2v2_int(prev_click, event->mval);
len = abs(len);
int mask_speed = RNA_int_get(op->ptr, "mask_speed");
int mask_expand_update_it = len / mask_speed;
diff --git a/source/blender/editors/transform/transform.c b/source/blender/editors/transform/transform.c
index 86afe1172a1..f212c7f5747 100644
--- a/source/blender/editors/transform/transform.c
+++ b/source/blender/editors/transform/transform.c
@@ -1097,8 +1097,8 @@ int transformEvent(TransInfo *t, const wmEvent *event)
break;
case TFM_MODAL_AUTOCONSTRAINT:
case TFM_MODAL_AUTOCONSTRAINTPLANE:
- if ((t->flag & T_RELEASE_CONFIRM) && (event->prevval == KM_RELEASE) &&
- event->prevtype == t->launch_event) {
+ if ((t->flag & T_RELEASE_CONFIRM) && (event->prev_val == KM_RELEASE) &&
+ event->prev_type == t->launch_event) {
/* Confirm transform if launch key is released after mouse move. */
t->state = TRANS_CONFIRM;
}
@@ -1137,13 +1137,13 @@ int transformEvent(TransInfo *t, const wmEvent *event)
}
break;
case TFM_MODAL_PRECISION:
- if (event->prevval == KM_PRESS) {
+ if (event->prev_val == KM_PRESS) {
t->modifiers |= MOD_PRECISION;
/* Shift is modifier for higher precision transform. */
t->mouse.precision = 1;
t->redraw |= TREDRAW_HARD;
}
- else if (event->prevval == KM_RELEASE) {
+ else if (event->prev_val == KM_RELEASE) {
t->modifiers &= ~MOD_PRECISION;
t->mouse.precision = 0;
t->redraw |= TREDRAW_HARD;