diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-01-19 09:21:15 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-01-19 09:21:15 +0300 |
| commit | c850320b35863edc35f0b0acd1c75ed48bb71542 (patch) | |
| tree | c3de2f92410308c0ece880a901864727b5731fc3 /source/blender/editors/armature/pose_select.c | |
| parent | 4d3d002b653c5b28320ada6b9d7f1e8c80bf944c (diff) | |
| parent | 7a24e0d175827824d139f7627de2a5af34d687fb (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/armature/pose_select.c')
| -rw-r--r-- | source/blender/editors/armature/pose_select.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/armature/pose_select.c b/source/blender/editors/armature/pose_select.c index f808f09f1f4..9bc678cd9e6 100644 --- a/source/blender/editors/armature/pose_select.c +++ b/source/blender/editors/armature/pose_select.c @@ -156,7 +156,7 @@ bool ED_do_pose_selectbuffer( * always give predictable behavior in weight paint mode - campbell */ if ((ob_act == NULL) || ((ob_act != ob) && (ob_act->mode & OB_MODE_WEIGHT_PAINT) == 0)) { /* when we are entering into posemode via toggle-select, - * frop another active object - always select the bone. */ + * from another active object - always select the bone. */ if (!extend && !deselect && toggle) { /* re-select below */ nearBone->flag &= ~BONE_SELECTED; |