vdm-brush-baker: Fix #105028 #105033

Robin Hohnsbeen · 2023-11-30T09:54:19+01:00

Robin Hohnsbeen commented

2023-11-30 09:54:19 +01:00

This PR should fix #105028

The material that is used for baking is kept inside the blend files so users can potentially change it and thus create errors in the addon. It will now be recreated every time a brush is baked to ensure it is unchanged.
There was another issue that can happen in language settings other than English. Some nodes were referred to by their name. Now they are searched by type.

This PR should fix https://projects.blender.org/blender/blender-addons/issues/105028 The material that is used for baking is kept inside the blend files so users can potentially change it and thus create errors in the addon. It will now be recreated every time a brush is baked to ensure it is unchanged. There was another issue that can happen in language settings other than English. Some nodes were referred to by their name. Now they are searched by type.

Robin Hohnsbeen added 14 commits 2023-11-30 09:54:21 +01:00

a9779b68ab VDM brush baker: An add-on to simplify the creation of vdm brushes in Blender.

05b03be3e3 Create bake material in python and removed blend file that contained material

f56ce6b83c Added documentation

5162ec56ba Reuse material name variable

c4b7117b5a Added render samples setting and increased default samples to 64 to reduce noise

36320fc98f Cleanup to code and UI

45bfdc0dff UI improvements

3cfa0d0623 Use one line license

89853e2295 Keep sculpting plane location and position

41b52119dd Keep same mode

fa3aaed03e vdm_brush_baker: Get material nodes by type not name to fix issues in other languages

37005eadba vdm_brush_baker: Recreate baking material to ensure it is unchanged by the user

f81fd0a57d vdm_brush_baker: Version bump (1.0.3)

92f8121151 Merge remote-tracking branch 'upstream/main' into vdm-brush-baker

# Conflicts:
#	vdm_brush_baker/__init__.py
#	vdm_brush_baker/bakematerial.py

Germano Cavalcante approved these changes 2023-11-30 12:55:55 +01:00

Germano Cavalcante left a comment

Good to see the issue being dealt with quickly :)

I've check the changes and It appears that tabs were used in place of spaces.
It would be beneficial to ensure the file remains compliant with autopep8 standards.

For some reason the diff got messed up, but apparently the changes were:
Added these lines:

    if material_name in bpy.data.materials:
        # Recreate material every time to ensure it is unchanged by the user which could lead to issues.
        # I would like to keep it directly after bake though so people could look at how it is made, if they are interested.
        bpy.data.materials.remove(bpy.data.materials[material_name])

Changed these lines:

-	    nodes.remove(nodes['Principled BSDF'])
+	    principled_node = next(n for n in new_material.node_tree.nodes if n.type == "BSDF_PRINCIPLED")

-	    material_output = nodes['Material Output']
+	    material_output = next(n for n in new_material.node_tree.nodes if n.type == "OUTPUT_MATERIAL")

LGTM.

The gitea API has changed and I don't know if the PR author can now land the path after confirmation.

If not, I can merge it into main and reference it to backport list. But I'll wait a bit to see if anyone else has any input.

Good to see the issue being dealt with quickly :) I've check the changes and It appears that tabs were used in place of spaces. It would be beneficial to ensure the file remains compliant with autopep8 standards. For some reason the diff got messed up, but apparently the changes were: Added these lines: ``` if material_name in bpy.data.materials: # Recreate material every time to ensure it is unchanged by the user which could lead to issues. # I would like to keep it directly after bake though so people could look at how it is made, if they are interested. bpy.data.materials.remove(bpy.data.materials[material_name]) ``` Changed these lines: ``` - nodes.remove(nodes['Principled BSDF']) + principled_node = next(n for n in new_material.node_tree.nodes if n.type == "BSDF_PRINCIPLED") ``` ``` - material_output = nodes['Material Output'] + material_output = next(n for n in new_material.node_tree.nodes if n.type == "OUTPUT_MATERIAL") ``` LGTM. The gitea API has changed and I don't know if the PR author can now land the path after confirmation. If not, I can merge it into main and reference it to backport list. But I'll wait a bit to see if anyone else has any input.

Robin Hohnsbeen commented

2023-11-30 13:07:29 +01:00

@mano-wii The changes you mention are correct. Additionally, I moved the code which creates all the nodes outside of that first if statement. That's probably one reason why there are so many changes visible. And I've double-checked that it's all spaces and no tabs. :)

Germano Cavalcante added 1 commit 2023-11-30 13:16:07 +01:00

094bc297de autopep8: replace Tab characters with Spaces

Germano Cavalcante commented

2023-11-30 13:17:57 +01:00

And I've double-checked that it's all spaces and no tabs. :)

Apparently it was only in one place. (I had the impression it was more).
Resolved in 094bc297de ;)

> And I've double-checked that it's all spaces and no tabs. :) Apparently it was only in one place. (I had the impression it was more). Resolved in 094bc297de ;)

Damien Picard commented

2023-11-30 14:56:58 +01:00

The bakematerials.py file uses DOS line endings (CR LF), but it should be converted to Unix (LF) otherwise every line looks like it’s changed.

Germano Cavalcante force-pushed vdm-brush-baker from 094bc297de to aa29a26392

2023-11-30 15:35:59 +01:00

Compare

Germano Cavalcante merged commit c79c97b774 into main

2023-11-30 15:36:47 +01:00

Germano Cavalcante referenced this issue from a commit

2023-11-30 15:36:48 +01:00

Fix #105028: Error when trying to create texture with VDM Brush Baker

Thomas Dinges referenced this issue from a commit