[Bf-blender-cvs] [2a7b9f2d45c] master: Cleanup: silence warning in recent commit

Pablo Vazquez noreply at git.blender.org
Mon Oct 25 16:52:29 CEST 2021


Commit: 2a7b9f2d45c345ee910a430e7035fd3d406de8f7
Author: Pablo Vazquez
Date:   Mon Oct 25 16:52:17 2021 +0200
Branches: master
https://developer.blender.org/rB2a7b9f2d45c345ee910a430e7035fd3d406de8f7

Cleanup: silence warning in recent commit

Thanks to Dr. Sybren for pointing it out!

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

M	source/blender/editors/space_nla/nla_draw.c

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

diff --git a/source/blender/editors/space_nla/nla_draw.c b/source/blender/editors/space_nla/nla_draw.c
index 0c81f461369..bf2d20cf4c9 100644
--- a/source/blender/editors/space_nla/nla_draw.c
+++ b/source/blender/editors/space_nla/nla_draw.c
@@ -550,7 +550,7 @@ static void nla_draw_strip(SpaceNla *snla,
   /* draw strip outline
    * - color used here is to indicate active vs non-active
    */
-  if (strip->flag & NLASTRIP_FLAG_ACTIVE | strip->flag & NLASTRIP_FLAG_SELECT) {
+  if (strip->flag & (NLASTRIP_FLAG_ACTIVE | NLASTRIP_FLAG_SELECT)) {
     /* strip should appear 'sunken', so draw a light border around it */
     color[0] = color[1] = color[2] = 1.0f; /* FIXME: hardcoded temp-hack colors */
   }



More information about the Bf-blender-cvs mailing list