diff options
author | Julian Eisel <julian@blender.org> | 2022-05-24 16:23:13 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2022-05-24 16:23:13 +0300 |
commit | 961db61fb87fb5400bc0080e6a4d2e3fc16c1761 (patch) | |
tree | 0b4a5972d3998771a1ae5c8c563b5973c6bcb62a /source/blender/editors/space_view3d | |
parent | 258f6cbf93678b7bfbd997a06ab0ec67571174b5 (diff) | |
parent | bc3dbf109c67fe2bced477774abdef7a53d66081 (diff) |
Merge branch 'blender-v3.2-release'
Diffstat (limited to 'source/blender/editors/space_view3d')
-rw-r--r-- | source/blender/editors/space_view3d/space_view3d.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c index e7732f07ed9..48abe71e35f 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.c @@ -590,16 +590,15 @@ static bool view3d_mat_drop_poll(bContext *C, wmDrag *drag, const wmEvent *event static char *view3d_mat_drop_tooltip(bContext *C, wmDrag *drag, const int xy[2], - struct wmDropBox *drop) + wmDropBox *UNUSED(drop)) { const char *name = WM_drag_get_item_name(drag); ARegion *region = CTX_wm_region(C); - RNA_string_set(drop->ptr, "name", name); int mval[2] = { xy[0] - region->winrct.xmin, xy[1] - region->winrct.ymin, }; - return ED_object_ot_drop_named_material_tooltip(C, drop->ptr, mval); + return ED_object_ot_drop_named_material_tooltip(C, name, mval); } static bool view3d_world_drop_poll(bContext *C, wmDrag *drag, const wmEvent *event) |