diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-10-15 11:27:59 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-10-15 11:27:59 +0300 |
commit | 3cdcd1fa9f0896632b05cc217649ac529f8e2e08 (patch) | |
tree | f4f982701b683c6e6d0e9c57e9d711aaaccfa41c | |
parent | 8bab53f5a0bfa8afcbbd9827d800ae4e005702cf (diff) | |
parent | 171a47421d09e3c08c3ea68538a98a9f72827cfc (diff) |
Merge branch 'blender-v2.81-release'
-rw-r--r-- | release/scripts/modules/bpy_types.py | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/release/scripts/modules/bpy_types.py b/release/scripts/modules/bpy_types.py index 6cb9600b9b4..43ee785438b 100644 --- a/release/scripts/modules/bpy_types.py +++ b/release/scripts/modules/bpy_types.py @@ -639,17 +639,27 @@ class Gizmo(StructRNA): if select_id is not None: gpu.select.load_id(select_id) + use_blend = False else: if self.is_highlight: color = (*self.color_highlight, self.alpha_highlight) else: color = (*self.color, self.alpha) shader.uniform_float("color", color) + use_blend = color[3] < 1.0 + + if use_blend: + # TODO: wrap GPU_blend from GPU state. + from bgl import glEnable, glDisable, GL_BLEND + glEnable(GL_BLEND) with gpu.matrix.push_pop(): gpu.matrix.multiply_matrix(matrix) batch.draw() + if use_blend: + glDisable(GL_BLEND) + @staticmethod def new_custom_shape(type, verts): """ |