From c383b027446f4f56daf900b264387feec41557dc Mon Sep 17 00:00:00 2001 From: Germano Cavalcante Date: Thu, 21 Jul 2022 10:54:15 -0300 Subject: Curve Tools: replace deprecated bgl module Part of T80730 --- curve_tools/path_finder.py | 13 ++++++------- curve_tools/show_resolution.py | 1 - curve_tools/splines_sequence.py | 3 +-- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/curve_tools/path_finder.py b/curve_tools/path_finder.py index abf53a6c..242ed27c 100644 --- a/curve_tools/path_finder.py +++ b/curve_tools/path_finder.py @@ -3,8 +3,8 @@ bl_info = { 'name': 'PathFinder', 'author': 'Spivak Vladimir (cwolf3d)', - 'version': (0, 5, 0), - 'blender': (2, 80, 0), + 'version': (0, 5, 1), + 'blender': (3, 0, 0), 'location': 'Curve Tools addon. (N) Panel', 'description': 'PathFinder - quick search, selection, removal of splines', 'warning': '', # used for warning icon and text in addons panel @@ -17,7 +17,6 @@ import time import threading import gpu -import bgl from gpu_extras.batch import batch_for_shader import bpy @@ -85,8 +84,8 @@ def draw_bezier_points(self, context, spline, matrix_world, path_color, path_thi shader.bind() shader.uniform_float("color", path_color) - bgl.glEnable(bgl.GL_BLEND) - bgl.glLineWidth(path_thickness) + gpu.state.blend_set('ALPHA') + gpu.state.line_width_set(path_thickness) batch.draw(shader) def draw_points(self, context, spline, matrix_world, path_color, path_thickness): @@ -98,8 +97,8 @@ def draw_points(self, context, spline, matrix_world, path_color, path_thickness) shader.bind() shader.uniform_float("color", path_color) - bgl.glEnable(bgl.GL_BLEND) - bgl.glLineWidth(path_thickness) + gpu.state.blend_set('ALPHA') + gpu.state.line_width_set(path_thickness) batch.draw(shader) def near(location3D, point, radius): diff --git a/curve_tools/show_resolution.py b/curve_tools/show_resolution.py index b2dbda7f..07a06540 100644 --- a/curve_tools/show_resolution.py +++ b/curve_tools/show_resolution.py @@ -6,7 +6,6 @@ import bpy from bpy import * from bpy.props import * -import bgl import blf import gpu from gpu_extras.batch import batch_for_shader diff --git a/curve_tools/splines_sequence.py b/curve_tools/splines_sequence.py index 98766058..2588b5d3 100644 --- a/curve_tools/splines_sequence.py +++ b/curve_tools/splines_sequence.py @@ -3,7 +3,6 @@ import bpy -import bgl import blf import gpu from gpu_extras.batch import batch_for_shader @@ -66,7 +65,7 @@ def draw(self, context, splines, sequence_color, font_thickness, font_size, matr batch = batch_for_shader(shader, 'LINES', {"pos": points}) shader.bind() - bgl.glLineWidth(font_thickness) + gpu.state.line_width_set(font_thickness) shader.uniform_float("color", sequence_color) batch.draw(shader) i += font_size + font_size * 0.5 -- cgit v1.2.3