diff options
| author | Aaron Carlisle <carlisle.b3d@gmail.com> | 2021-10-20 15:45:30 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2021-10-20 16:00:01 +0300 |
| commit | 2743d746ea4f38c098512f6dd6fc33d5a62429d3 (patch) | |
| tree | 0680f3c4713b7ecd698b91c5d1298734fc55f7ff /source/blender/editors/object | |
| parent | 3435ea014d42d1e223513f448cbdaba63864115c (diff) | |
Cleanup: use an array for wmEvent cursor position variables
Use arrays for wmEvent coordinates, this quiets warnings with GCC11.
- `x, y` -> `xy`.
- `prevx, prevy` -> `prev_xy`.
- `prevclickx, prevclicky` -> `prev_click_xy`.
There is still some cleanup such as using `copy_v2_v2_int()`,
this can be done separately.
Reviewed By: campbellbarton, Severin
Ref D12901
Diffstat (limited to 'source/blender/editors/object')
| -rw-r--r-- | source/blender/editors/object/object_add.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 9c6969110fd..114f540b614 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -259,8 +259,8 @@ static bool object_add_drop_xy_get(bContext *C, wmOperator *op, int (*r_mval)[2] static int object_add_drop_xy_generic_invoke(bContext *C, wmOperator *op, const wmEvent *event) { if (!object_add_drop_xy_is_set(op)) { - RNA_int_set(op->ptr, "drop_x", event->x); - RNA_int_set(op->ptr, "drop_y", event->y); + RNA_int_set(op->ptr, "drop_x", event->xy[0]); + RNA_int_set(op->ptr, "drop_y", event->xy[1]); } return op->type->exec(C, op); } @@ -1691,8 +1691,8 @@ static int collection_instance_add_exec(bContext *C, wmOperator *op) static int object_instance_add_invoke(bContext *C, wmOperator *op, const wmEvent *event) { if (!object_add_drop_xy_is_set(op)) { - RNA_int_set(op->ptr, "drop_x", event->x); - RNA_int_set(op->ptr, "drop_y", event->y); + RNA_int_set(op->ptr, "drop_x", event->xy[0]); + RNA_int_set(op->ptr, "drop_y", event->xy[1]); } if (!RNA_struct_property_is_set(op->ptr, "name")) { |