diff options
author | Julian Eisel <julian@blender.org> | 2022-05-24 16:13:20 +0300 |
---|---|---|
committer | Julian Eisel <julian@blender.org> | 2022-05-24 16:22:18 +0300 |
commit | bc3dbf109c67fe2bced477774abdef7a53d66081 (patch) | |
tree | 54500aac1a409cb5f4cce9460b2905150b97de3d /source/blender/editors/include | |
parent | 463077a3d59df3de8a8fdc218c06c38116829f3e (diff) |
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.
Diffstat (limited to 'source/blender/editors/include')
-rw-r--r-- | source/blender/editors/include/ED_object.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h index 28452ba8db9..0078c1087a0 100644 --- a/source/blender/editors/include/ED_object.h +++ b/source/blender/editors/include/ED_object.h @@ -234,7 +234,7 @@ struct Base *ED_object_add_duplicate(struct Main *bmain, void ED_object_parent(struct Object *ob, struct Object *parent, int type, const char *substr); char *ED_object_ot_drop_named_material_tooltip(struct bContext *C, - struct PointerRNA *properties, + const char *name, const int mval[2]); /* bitflags for enter/exit editmode */ |