diff options
author | Bastien Montagne <bastien@blender.org> | 2021-01-25 12:56:55 +0300 |
---|---|---|
committer | Bastien Montagne <bastien@blender.org> | 2021-01-25 12:56:55 +0300 |
commit | a0b85800ec306d7a68815378acec069de7f65df9 (patch) | |
tree | f837b678eb6e8fda4d4b9d1f326a51cc21627698 /source/blender | |
parent | 4d94e2afc86e0bbc441bc1e571e5398bbdc7c025 (diff) | |
parent | 3df2bea88be49d396894bf7495b573c0683ad219 (diff) |
Merge branch 'blender-v2.92-release'
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/armature/pose_group.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_pose.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/armature/pose_group.c b/source/blender/editors/armature/pose_group.c index 6ef46a792c4..55c9877e55f 100644 --- a/source/blender/editors/armature/pose_group.c +++ b/source/blender/editors/armature/pose_group.c @@ -63,7 +63,7 @@ static bool pose_group_poll(bContext *C) Object *obpose = ED_pose_object_from_context(C); if ((obpose->proxy != NULL) || (obpose->proxy_group != NULL) || ID_IS_OVERRIDE_LIBRARY(obpose)) { - CTX_wm_operator_poll_msg_set(C, "Cannot edit bonegroups for proxies or library overrides"); + CTX_wm_operator_poll_msg_set(C, "Cannot edit bone groups for proxies or library overrides"); return false; } diff --git a/source/blender/makesrna/intern/rna_pose.c b/source/blender/makesrna/intern/rna_pose.c index cd3e4a09fc3..996a1ebc5c7 100644 --- a/source/blender/makesrna/intern/rna_pose.c +++ b/source/blender/makesrna/intern/rna_pose.c @@ -141,7 +141,7 @@ static char *rna_PoseBone_path(PointerRNA *ptr) static bool rna_bone_group_poll(Object *ob, ReportList *reports) { if ((ob->proxy != NULL) || (ob->proxy_group != NULL) || ID_IS_OVERRIDE_LIBRARY(ob)) { - BKE_report(reports, RPT_ERROR, "Cannot edit bonegroups for proxies or library overrides"); + BKE_report(reports, RPT_ERROR, "Cannot edit boneg roups for proxies or library overrides"); return false; } |