Fix blender 5.0 (kinda) (#27)

* Fix blender 5.0 (kinda)

* fix black

Author: Lilaa3

common.py

@@ -177,6 +177,7 @@ def collect_obj_info(
 
         mat_count = max(len(obj.material_slots), 1)
         vert_buf = create_vert_buf(
+            render_engine.shader,
             render_engine.vbo_format,
             render_obj.vert,
             render_obj.norm,

mesa_warning.py

@@ -10,7 +10,7 @@ class MesaWarningPopup(Operator):
     already_invoked = False  # HACK: used to prevent multiple dialogs from popping up
 
     def invoke(self, context: Context, event: Event):
-        prefs = context.preferences.addons[__name__.split(".")[0]].preferences
+        prefs = context.preferences.addons[__package__].preferences
         if prefs.dont_warn_about_mesa:
             return {"CANCELLED"}
         if MesaWarningPopup.already_invoked:
@@ -47,7 +47,7 @@ def draw(self, context: Context):
             icon="INFO",
         )
 
-        prefs = context.preferences.addons[__name__.split(".")[0]].preferences
+        prefs = context.preferences.addons[__package__].preferences
         col.prop(prefs, "dont_warn_about_mesa", text="Don't warn me again")
 
     def cancel(self, context: Context):

mesh/gpu_batch.py

@@ -3,14 +3,22 @@
 
 
 def create_vert_buf(
-    vbo_format, buff_vert: np.ndarray, buff_norm: np.ndarray, buff_color: np.ndarray, buff_uv: np.ndarray
+    shader: gpu.types.GPUShader,
+    vbo_format,
+    buff_vert: np.ndarray,
+    buff_norm: np.ndarray,
+    buff_color: np.ndarray,
+    buff_uv: np.ndarray,
 ) -> list[gpu.types.GPUBatch]:
-    vbo = gpu.types.GPUVertBuf(vbo_format, len(buff_vert))
+    def fill_attr(name: str, data: np.ndarray):
+        aid = shader.attr_from_name(name)
+        vbo.attr_fill(aid, data)
 
-    vbo.attr_fill("pos", buff_vert)
-    vbo.attr_fill("inNormal", buff_norm)
-    vbo.attr_fill("inColor", buff_color)
-    vbo.attr_fill("inUV", buff_uv)
+    vbo = gpu.types.GPUVertBuf(vbo_format, len(buff_vert))
+    fill_attr("pos", buff_vert)
+    fill_attr("inNormal", buff_norm)
+    fill_attr("inColor", buff_color)
+    fill_attr("inUV", buff_uv)
 
     return vbo
 

properties.py

@@ -297,7 +297,7 @@ class F64RenderProperties(PropertyGroup):
 
 
 class F64AddonPreferences(AddonPreferences):
-    bl_idname = __name__.split(".")[0]
+    bl_idname = __package__
 
     use_atomic_rendering: bpy.props.BoolProperty(
         name="Use Atomic Rendering",

renderer.py

@@ -333,7 +333,7 @@ def draw_scene(self, context, depsgraph):
         f64render_rs: F64RenderSettings = depsgraph.scene.f64render.render_settings
         always_set = f64render_rs.always_set
         projection_matrix, view_matrix = context.region_data.perspective_matrix, context.region_data.view_matrix
-        prefs = context.preferences.addons[__name__.split(".")[0]].preferences
+        prefs = context.preferences.addons[__package__].preferences
         self.use_atomic_rendering = bpy.app.version >= (4, 1, 0) and prefs.use_atomic_rendering
 
         if F64_GLOBALS.rebuild_shaders or self.shader is None:
@@ -401,7 +401,8 @@ def draw_scene(self, context, depsgraph):
 
         # @TODO: why can't i cache this?
         vbo_2d = gpu.types.GPUVertBuf(self.shader_2d.format_calc(), 6)
-        vbo_2d.attr_fill("pos", [(-1, -1), (-1, 1), (1, 1), (1, 1), (1, -1), (-1, -1)])
+        aid = self.shader_2d.attr_from_name("pos")
+        vbo_2d.attr_fill(aid, [(-1, -1), (-1, 1), (1, 1), (1, 1), (1, -1), (-1, -1)])
         batch_2d = gpu.types.GPUBatch(type="TRIS", buf=vbo_2d)
 
         self.shader_2d.image("color_texture", self.color_texture)
@@ -419,7 +420,7 @@ class F64RenderSettingsPanel(bpy.types.Panel):
     def draw(self, context):
         f64render_rs: F64RenderSettings = context.scene.f64render.render_settings
         f64render_rs.draw_props(self.layout, context.scene.gameEditorMode)
-        prefs = context.preferences.addons[__name__.split(".")[0]].preferences
+        prefs = context.preferences.addons[__package__].preferences
         prefs.draw_props(self.layout)