merge upstream

leenkx/blender/lnx/lightmapper/utility/encoding.py

@@ -1,9 +1,12 @@
-import bpy, math, os, gpu, bgl, importlib
+import bpy, math, os, gpu, importlib
 import numpy as np
 from . import utility
 from fractions import Fraction
 from gpu_extras.batch import batch_for_shader
 
+if bpy.app.version < (4, 0, 0):
+    import bgl
+
 def splitLogLuvAlphaAtlas(imageIn, outDir, quality):
     pass
 

leenkx/blender/lnx/lightmapper/utility/gui/Viewport.py

@@ -1,6 +1,9 @@
-import bpy, blf, bgl, os, gpu
+import bpy, blf, os, gpu
 from gpu_extras.batch import batch_for_shader
 
+if bpy.app.version < (4, 0, 0):
+    import bgl
+
 class ViewportDraw:
 
     def __init__(self, context, text):

leenkx/blender/lnx/material/cycles_nodes/nodes_color.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import bpy
 
 import lnx

leenkx/blender/lnx/material/cycles_nodes/nodes_converter.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from typing import Union
 
 import bpy

leenkx/blender/lnx/material/cycles_nodes/nodes_input.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from typing import Union
 
 import bpy

leenkx/blender/lnx/material/cycles_nodes/nodes_shader.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import bpy
 from bpy.types import NodeSocket
 

leenkx/blender/lnx/material/cycles_nodes/nodes_texture.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 import math
 import os
 from typing import Union

leenkx/blender/lnx/material/cycles_nodes/nodes_vector.py

@@ -1,3 +1,4 @@
+from __future__ import annotations
 from typing import Union
 
 import bpy