Merge pull request #71 from wziard/blender-4-fixes

Some blender 4 fixes
SBCV · Jan 18, 2024 · 7d66bad · 7d66bad
2 parents 4555beb + 6f31346
commit 7d66bad
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/photogrammetry_importer/importers/camera_utility.py b/photogrammetry_importer/importers/camera_utility.py
@@ -522,7 +522,7 @@ def add_camera_image_plane(
     if add_image_plane_emission:
         links.new(
             shader_node_tex_image.outputs["Color"],
-            shader_node_principled_bsdf.inputs["Emission"],
+            shader_node_principled_bsdf.inputs["Emission Color"],
         )
 
     shader_node_tex_image.image = blender_image

diff --git a/photogrammetry_importer/importers/mesh_importer.py b/photogrammetry_importer/importers/mesh_importer.py
@@ -42,8 +42,8 @@ def import_photogrammetry_mesh(self, mesh_fp, reconstruction_collection):
 
             if os.path.splitext(mesh_fp)[1].lower() == ".obj":
                 # https://docs.blender.org/api/current/bpy.ops.import_scene.html
-                bpy.ops.import_scene.obj(
-                    filepath=mesh_fp, axis_forward="Y", axis_up="Z"
+                bpy.ops.wm.obj_import(
+                    filepath=mesh_fp, forward_axis="NEGATIVE_Y", up_axis="NEGATIVE_Z"
                 )
             elif os.path.splitext(mesh_fp)[1].lower() == ".ply":
                 # https://docs.blender.org/api/current/bpy.ops.import_mesh.html

diff --git a/photogrammetry_importer/importers/mesh_utility.py b/photogrammetry_importer/importers/mesh_utility.py
@@ -13,7 +13,7 @@ def add_color_emission_to_material(mesh_obj):
 
         node_tree.links.new(
             input_socket,
-            principled_bsdf_node.inputs["Emission"],
+            principled_bsdf_node.inputs["Emission Color"],
         )
 
 
@@ -55,5 +55,5 @@ def add_mesh_vertex_color_material(
     if add_mesh_color_emission:
         node_tree.links.new(
             attribute_node.outputs["Color"],
-            principled_bsdf_node.inputs["Emission"],
+            principled_bsdf_node.inputs["Emission Color"],
         )
diff --git a/photogrammetry_importer/importers/point_utility.py b/photogrammetry_importer/importers/point_utility.py
@@ -179,7 +179,7 @@ def _add_particle_material(
     if add_particle_color_emission:
         node_tree.links.new(
             particle_color_node.outputs["Color"],
-            principled_bsdf_node.inputs["Emission"],
+            principled_bsdf_node.inputs["Emission Color"],
         )
 
 

diff --git a/photogrammetry_importer/opengl/draw_manager.py b/photogrammetry_importer/opengl/draw_manager.py
@@ -98,7 +98,7 @@ class _DrawCallBackHandler:
     """Class that allows to handle point drawing callbacks."""
 
     def __init__(self):
-        self._shader = gpu.shader.from_builtin("3D_FLAT_COLOR")
+        self._shader = gpu.shader.from_builtin("FLAT_COLOR")
 
         # Handle to the function
         self._draw_handler_handle = None