Port to blender4 Merged with blender4-image-export #296
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
keianhzo
reviewed
Jun 13, 2024
There was a problem hiding this comment.
As talked in the meeting, we need to correctly handle the return parameters from __gather_texture_transform_and_tex_coord and we should be good to land.
I think probably something like this would work:
if bpy.app.version < (3, 2, 0):
tex_transform, tex_coord = gltf2_blender_gather_texture_info.__gather_texture_transform_and_tex_coord(
texture_socket, export_settings)
elif bpy.app.version >= (4, 0, 0):
socket = gltf2_blender_search_node_tree.NodeSocket(
texture_socket, blender_material)
tex_transform, tex_coord = gltf2_blender_gather_texture_info.__gather_texture_transform_and_tex_coord(
socket, export_settings)
else:
tex_transform, tex_coord, _ = gltf2_blender_gather_texture_info.__gather_texture_transform_and_tex_coord(
texture_socket, export_settings)
keianhzo
requested changes
Jun 18, 2024
addons/io_hubs_addon/io/utils.py
Outdated
| else: | ||
| tex_transform, tex_coord, _ = gltf2_blender_gather_texture_info.__gather_texture_transform_and_tex_coord( | ||
| print("processing __gather_texture_transform_and_tex_coord") |
There was a problem hiding this comment.
Suggested change
| print("processing __gather_texture_transform_and_tex_coord") |
addons/io_hubs_addon/io/utils.py
Outdated
| else: | ||
| tex_transform, tex_coord, _ = gltf2_blender_gather_texture_info.__gather_texture_transform_and_tex_coord( | ||
| print("processing __gather_texture_transform_and_tex_coord") | ||
| tex_transform, tex_coord = gltf2_blender_gather_texture_info.__gather_texture_transform_and_tex_coord( |
There was a problem hiding this comment.
Suggested change
| tex_transform, tex_coord = gltf2_blender_gather_texture_info.__gather_texture_transform_and_tex_coord( | |
| tex_transform, tex_coord, _ = gltf2_blender_gather_texture_info.__gather_texture_transform_and_tex_coord( | |
| texture_socket, export_settings) |
Exairnous
requested changes
Jun 19, 2024
There was a problem hiding this comment.
@keianhzo 4.0 support turned out to be trickier than we thought at the dev meetup.
@Spiderguy-F We identified at the meetup that Blender 4.0 was the cause of the errors I had been seeing. I have added suggestions to fix all the errors and so now the add-on should work for all the supported Blender versions. I have incorporated the fixes suggested by @keianhzo in my suggestions. It turns out that Blender 4.0 requires the same code path as versions below 3.2, but I don't see a cleaner way to implement this than what I've suggested here; however, anyone is welcome to try to improve on my suggestions. :)
addons/io_hubs_addon/io/utils.py
Outdated
| @@ -47,7 +49,10 @@ def from_blender_image(image: bpy.types.Image): | |||
|
|
|||
| def encode(self, mime_type: Optional[str], export_settings) -> Union[Tuple[bytes, bool], bytes]: | |||
| if mime_type == "image/vnd.radiance": | |||
| return self.encode_from_image_hdr(self.blender_image()) | |||
| if bpy.app.version < (4, 0, 0): | |||
There was a problem hiding this comment.
Suggested change
| if bpy.app.version < (4, 0, 0): | |
| if bpy.app.version < (4, 1, 0): |
addons/io_hubs_addon/io/utils.py
Outdated
Comment on lines
374
to
377
| elif bpy.app.version >= (4, 0, 0): | ||
| socket = gltf2_blender_search_node_tree.NodeSocket(texture_socket, blender_material) | ||
| tex_transform, tex_coord = gltf2_blender_gather_texture_info.__gather_texture_transform_and_tex_coord( | ||
| socket, export_settings) |
There was a problem hiding this comment.
Suggested change
| elif bpy.app.version >= (4, 0, 0): | |
| socket = gltf2_blender_search_node_tree.NodeSocket(texture_socket, blender_material) | |
| tex_transform, tex_coord = gltf2_blender_gather_texture_info.__gather_texture_transform_and_tex_coord( | |
| socket, export_settings) | |
| elif bpy.app.version < (4, 0, 0): | |
| tex_transform, tex_coord, _ = gltf2_blender_gather_texture_info.__gather_texture_transform_and_tex_coord( | |
| texture_socket, export_settings) | |
| elif bpy.app.version < (4, 1, 0): | |
| tex_transform, tex_coord = gltf2_blender_gather_texture_info.__gather_texture_transform_and_tex_coord( | |
| texture_socket, export_settings) |
Requested Changes Co-authored-by: Exairnous <[email protected]>
Exairnous
requested changes
Jul 9, 2024
addons/io_hubs_addon/io/utils.py
Outdated
| @@ -10,6 +10,8 @@ | |||
| from io_scene_gltf2.blender.exp import gltf2_blender_gather_texture_info, gltf2_blender_export_keys | |||
| from io_scene_gltf2.blender.exp import gltf2_blender_image | |||
| from io_scene_gltf2.blender.exp.gltf2_blender_gather_cache import cached | |||
| if bpy.app.version >= (4, 0, 0): | |||
There was a problem hiding this comment.
Suggested change
| if bpy.app.version >= (4, 0, 0): | |
| if bpy.app.version >= (4, 1, 0): |
addons/io_hubs_addon/io/utils.py
Outdated
| else: | ||
| tex_transform, tex_coord, _ = gltf2_blender_gather_texture_info.__gather_texture_transform_and_tex_coord( | ||
| texture_socket, export_settings) | ||
| socket = lightmap_node.inputs.get("Lightmap") if bpy.app.version < (4, 0, 0) \ |
There was a problem hiding this comment.
Suggested change
| socket = lightmap_node.inputs.get("Lightmap") if bpy.app.version < (4, 0, 0) \ | |
| socket = lightmap_node.inputs.get("Lightmap") if bpy.app.version < (4, 1, 0) \ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Opened a new pull request, like you suggested