[Bf-blender-cvs] [85ddaaa16ed] blender-v2.81-release: Fix invalid flag check

Campbell Barton noreply at git.blender.org
Thu Oct 17 03:39:16 CEST 2019


Commit: 85ddaaa16ede2fb223898e8e28182f4b6dec337e
Author: Campbell Barton
Date:   Thu Oct 17 12:22:58 2019 +1100
Branches: blender-v2.81-release
https://developer.blender.org/rB85ddaaa16ede2fb223898e8e28182f4b6dec337e

Fix invalid flag check

Cast occurs first, making any flag enable this option.

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

M	source/blender/draw/engines/gpencil/gpencil_draw_utils.c

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

diff --git a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
index 7b0f0f10705..9599c91bfd7 100644
--- a/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
+++ b/source/blender/draw/engines/gpencil/gpencil_draw_utils.c
@@ -1381,7 +1381,7 @@ static void gpencil_draw_onionskins(GpencilBatchCache *cache,
                             NULL;
   int last = gpf->framenum;
 
-  colflag = (bool)gpd->onion_flag & GP_ONION_GHOST_PREVCOL;
+  colflag = (gpd->onion_flag & GP_ONION_GHOST_PREVCOL) != 0;
   const short onion_keytype = gpd->onion_keytype;
   /* -------------------------------
    * 1) Draw Previous Frames First



More information about the Bf-blender-cvs mailing list