blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

Merge branch 'blender-v2.92-release'

This commit is contained in:
Bastien Montagne 2021-01-25 10:56:55 +01:00
parent 4d94e2afc8 3df2bea88b
commit a0b85800ec
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/armature/pose_group.c
View File

@ -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;
}

2
source/blender/makesrna/intern/rna_pose.c
View File

@ -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;
}