From bc3dbf109c67fe2bced477774abdef7a53d66081 Mon Sep 17 00:00:00 2001 From: Julian Eisel Date: Tue, 24 May 2022 15:13:20 +0200 Subject: Fix T95706: Material asset not applied if appended and then linked 8f79fa9c6780 was an attempt to fix this already, but it didn't quite work. Problem was that the tooltip was messing with the drop-box and operator properties, setting the name property for its own internal logic. This name property would then be used rather than the session UUID to query the material, which gave the wrong material (linking can result in multiple IDs of the same type with the same name). A followup commit will further sanitize this. --- source/blender/editors/space_view3d/space_view3d.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'source/blender/editors/space_view3d/space_view3d.c') 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) -- cgit v1.2.3