[Bf-blender-cvs] [b4200f8da4d] greasepencil-object: Merge branch 'master' into greasepencil-object

[Antonio Vazquez]

Commit: b4200f8da4d2447f3e6963cc6a0884166d2ac306
Author: Antonio Vazquez
Date:   Mon Feb 24 18:59:15 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rBb4200f8da4d2447f3e6963cc6a0884166d2ac306

Merge branch 'master' into greasepencil-object

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



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

diff --cc source/blender/draw/engines/overlay/overlay_private.h
index deb3604f7ce,185df723301..167a8e940df
--- a/source/blender/draw/engines/overlay/overlay_private.h
+++ b/source/blender/draw/engines/overlay/overlay_private.h
@@@ -278,9 -274,9 +280,10 @@@ typedef struct OVERLAY_PrivateData 
    bool hide_overlays;
    bool xray_enabled;
    bool xray_enabled_and_not_wire;
+   float xray_opacity;
    short v3d_flag;     /* TODO move to View3DOverlay */
    short v3d_gridflag; /* TODO move to View3DOverlay */
 +  int cfra;
    DRWState clipping_state;
    OVERLAY_ShadingData shdata;