diff options
Diffstat (limited to 'source/blender/editors')
4 files changed, 6 insertions, 7 deletions
diff --git a/source/blender/editors/interface/interface_ops.cc b/source/blender/editors/interface/interface_ops.cc index a42e08c59d5..a5b0193a86d 100644 --- a/source/blender/editors/interface/interface_ops.cc +++ b/source/blender/editors/interface/interface_ops.cc @@ -133,10 +133,10 @@ static int copy_data_path_button_exec(bContext *C, wmOperator *op) if (ptr.owner_id != nullptr) { if (full_path) { if (prop) { - path = RNA_path_full_property_py_ex(bmain, &ptr, prop, index, true); + path = RNA_path_full_property_py_ex(&ptr, prop, index, true); } else { - path = RNA_path_full_struct_py(bmain, &ptr); + path = RNA_path_full_struct_py(&ptr); } } else { diff --git a/source/blender/editors/interface/interface_region_tooltip.cc b/source/blender/editors/interface/interface_region_tooltip.cc index 8d88261c328..a6e37d3f36f 100644 --- a/source/blender/editors/interface/interface_region_tooltip.cc +++ b/source/blender/editors/interface/interface_region_tooltip.cc @@ -952,11 +952,10 @@ static uiTooltipData *ui_tooltip_data_from_button_or_extra_icon(bContext *C, /* never fails */ /* Move ownership (no need for re-allocation). */ if (rnaprop) { - field->text = RNA_path_full_property_py_ex( - CTX_data_main(C), &but->rnapoin, rnaprop, but->rnaindex, true); + field->text = RNA_path_full_property_py_ex(&but->rnapoin, rnaprop, but->rnaindex, true); } else { - field->text = RNA_path_full_struct_py(CTX_data_main(C), &but->rnapoin); + field->text = RNA_path_full_struct_py(&but->rnapoin); } } } diff --git a/source/blender/editors/space_console/space_console.c b/source/blender/editors/space_console/space_console.c index 7023c91ac85..417c65eb01a 100644 --- a/source/blender/editors/space_console/space_console.c +++ b/source/blender/editors/space_console/space_console.c @@ -155,7 +155,7 @@ static void id_drop_copy(bContext *UNUSED(C), wmDrag *drag, wmDropBox *drop) ID *id = WM_drag_get_local_ID(drag, 0); /* copy drag path to properties */ - char *text = RNA_path_full_ID_py(G_MAIN, id); + char *text = RNA_path_full_ID_py(id); RNA_string_set(drop->ptr, "text", text); MEM_freeN(text); } diff --git a/source/blender/editors/space_text/space_text.c b/source/blender/editors/space_text/space_text.c index 62e2caa7596..45cf557c4b4 100644 --- a/source/blender/editors/space_text/space_text.c +++ b/source/blender/editors/space_text/space_text.c @@ -326,7 +326,7 @@ static void text_drop_paste(bContext *UNUSED(C), wmDrag *drag, wmDropBox *drop) ID *id = WM_drag_get_local_ID(drag, 0); /* copy drag path to properties */ - text = RNA_path_full_ID_py(G_MAIN, id); + text = RNA_path_full_ID_py(id); RNA_string_set(drop->ptr, "text", text); MEM_freeN(text); } |