[Bf-blender-cvs] [5ed2ed28ab3] master: CodeCleanup: Supressed warning

Jeroen Bakker noreply at git.blender.org
Fri Jun 5 13:40:57 CEST 2020


Commit: 5ed2ed28ab308ed65290c3a36f0ff652cb710e94
Author: Jeroen Bakker
Date:   Fri Jun 5 13:39:57 2020 +0200
Branches: master
https://developer.blender.org/rB5ed2ed28ab308ed65290c3a36f0ff652cb710e94

CodeCleanup: Supressed warning

===================================================================

M	source/blender/editors/armature/armature_select.c

===================================================================

diff --git a/source/blender/editors/armature/armature_select.c b/source/blender/editors/armature/armature_select.c
index 4b8bbe39a16..8e03dbc7dc3 100644
--- a/source/blender/editors/armature/armature_select.c
+++ b/source/blender/editors/armature/armature_select.c
@@ -1205,8 +1205,8 @@ bool ED_armature_edit_select_op_from_tagged(bArmature *arm, const int sel_op)
       ebone->temp.i = ebone->flag;
 
       /* When there is a partial selection without both endpoints, only select an endpoint. */
-      if ((is_inside_flag & BONESEL_BONE) && (is_inside_flag & (BONESEL_ROOT | BONESEL_TIP)) &&
-          ((is_inside_flag & (BONESEL_ROOT | BONESEL_TIP)) != (BONESEL_ROOT | BONESEL_TIP))) {
+      if ((is_inside_flag & BONESEL_BONE) &&
+          ELEM(is_inside_flag & (BONESEL_ROOT | BONESEL_TIP), BONESEL_ROOT, BONESEL_TIP)) {
         is_inside_flag &= ~BONESEL_BONE;
       }



More information about the Bf-blender-cvs mailing list