From b05d3c27970e378f61d83d5e3229b9b1df7a6c94 Mon Sep 17 00:00:00 2001 From: Pablo Vazquez Date: Tue, 5 Mar 2019 17:06:11 +0100 Subject: UI: Nicer report when trying to edit external libraries Rename 'libdata' to 'library data'. --- source/blender/editors/interface/interface_templates.c | 2 +- source/blender/editors/object/object_add.c | 4 ++-- source/blender/editors/space_outliner/outliner_edit.c | 2 +- source/blender/editors/space_text/text_ops.c | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'source/blender/editors') diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index 0d2a7248a2e..1d79832f88f 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -1323,7 +1323,7 @@ void uiTemplatePathBuilder( /************************ Modifier Template *************************/ -#define ERROR_LIBDATA_MESSAGE IFACE_("Can't edit external libdata") +#define ERROR_LIBDATA_MESSAGE IFACE_("Can't edit external library data") static void modifiers_convertToReal(bContext *C, void *ob_v, void *md_v) { diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c index 23fc8109043..0e6505ab712 100644 --- a/source/blender/editors/object/object_add.c +++ b/source/blender/editors/object/object_add.c @@ -2444,7 +2444,7 @@ static int join_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; } else if (BKE_object_obdata_is_libdata(ob)) { - BKE_report(op->reports, RPT_ERROR, "Cannot edit external libdata"); + BKE_report(op->reports, RPT_ERROR, "Cannot edit external library data"); return OPERATOR_CANCELLED; } else if (ob->type == OB_GPENCIL) { @@ -2506,7 +2506,7 @@ static int join_shapes_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; } else if (BKE_object_obdata_is_libdata(ob)) { - BKE_report(op->reports, RPT_ERROR, "Cannot edit external libdata"); + BKE_report(op->reports, RPT_ERROR, "Cannot edit external library data"); return OPERATOR_CANCELLED; } diff --git a/source/blender/editors/space_outliner/outliner_edit.c b/source/blender/editors/space_outliner/outliner_edit.c index 3742a1ad912..a96d5ad183f 100644 --- a/source/blender/editors/space_outliner/outliner_edit.c +++ b/source/blender/editors/space_outliner/outliner_edit.c @@ -268,7 +268,7 @@ static void do_item_rename(ARegion *ar, TreeElement *te, TreeStoreElem *tselem, } } else if (ID_IS_LINKED(tselem->id)) { - BKE_report(reports, RPT_WARNING, "Cannot edit external libdata"); + BKE_report(reports, RPT_WARNING, "Cannot edit external library data"); } else if (te->idcode == ID_LI && ((Library *)tselem->id)->parent) { BKE_report(reports, RPT_WARNING, "Cannot edit the path of an indirectly linked library"); diff --git a/source/blender/editors/space_text/text_ops.c b/source/blender/editors/space_text/text_ops.c index c2f3be0d881..563aacafc50 100644 --- a/source/blender/editors/space_text/text_ops.c +++ b/source/blender/editors/space_text/text_ops.c @@ -84,7 +84,7 @@ static bool text_edit_poll(bContext *C) return 0; if (ID_IS_LINKED(text)) { - // BKE_report(op->reports, RPT_ERROR, "Cannot edit external libdata"); + // BKE_report(op->reports, RPT_ERROR, "Cannot edit external library data"); return 0; } @@ -100,7 +100,7 @@ bool text_space_edit_poll(bContext *C) return 0; if (ID_IS_LINKED(text)) { - // BKE_report(op->reports, RPT_ERROR, "Cannot edit external libdata"); + // BKE_report(op->reports, RPT_ERROR, "Cannot edit external library data"); return 0; } @@ -120,7 +120,7 @@ static bool text_region_edit_poll(bContext *C) return 0; if (ID_IS_LINKED(text)) { - // BKE_report(op->reports, RPT_ERROR, "Cannot edit external libdata"); + // BKE_report(op->reports, RPT_ERROR, "Cannot edit external library data"); return 0; } -- cgit v1.2.3