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:
authorJulian Eisel <julian@blender.org>2022-05-24 16:23:13 +0300
committerJulian Eisel <julian@blender.org>2022-05-24 16:23:13 +0300
commit961db61fb87fb5400bc0080e6a4d2e3fc16c1761 (patch)
tree0b4a5972d3998771a1ae5c8c563b5973c6bcb62a /source/blender/editors/object/object_relations.c
parent258f6cbf93678b7bfbd997a06ab0ec67571174b5 (diff)
parentbc3dbf109c67fe2bced477774abdef7a53d66081 (diff)
Merge branch 'blender-v3.2-release'
Diffstat (limited to 'source/blender/editors/object/object_relations.c')
-rw-r--r--source/blender/editors/object/object_relations.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/source/blender/editors/object/object_relations.c b/source/blender/editors/object/object_relations.c
index 64ae425c9f4..abbde3b5b3a 100644
--- a/source/blender/editors/object/object_relations.c
+++ b/source/blender/editors/object/object_relations.c
@@ -2605,9 +2605,7 @@ void OBJECT_OT_make_single_user(wmOperatorType *ot)
/** \name Drop Named Material on Object Operator
* \{ */
-char *ED_object_ot_drop_named_material_tooltip(bContext *C,
- PointerRNA *properties,
- const int mval[2])
+char *ED_object_ot_drop_named_material_tooltip(bContext *C, const char *name, const int mval[2])
{
int mat_slot = 0;
Object *ob = ED_view3d_give_material_slot_under_cursor(C, mval, &mat_slot);
@@ -2616,9 +2614,6 @@ char *ED_object_ot_drop_named_material_tooltip(bContext *C,
}
mat_slot = max_ii(mat_slot, 1);
- char name[MAX_ID_NAME - 2];
- RNA_string_get(properties, "name", name);
-
Material *prev_mat = BKE_object_material_get(ob, mat_slot);
char *result;
@@ -2641,7 +2636,7 @@ static int drop_named_material_invoke(bContext *C, wmOperator *op, const wmEvent
mat_slot = max_ii(mat_slot, 1);
Material *ma = (Material *)WM_operator_properties_id_lookup_from_name_or_session_uuid(
- bmain, op, ID_MA);
+ bmain, op->ptr, ID_MA);
if (ob == NULL || ma == NULL) {
return OPERATOR_CANCELLED;