diff --git a/.gitignore b/.gitignore index 684a2c2..363088a 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /screenshots /startup /www +/.idea diff --git a/addons/bl_datasmith/export_material.py b/addons/bl_datasmith/export_material.py index e0905a1..b022c00 100644 --- a/addons/bl_datasmith/export_material.py +++ b/addons/bl_datasmith/export_material.py @@ -1169,7 +1169,7 @@ def exp_uvmap(socket, exp_list): m = material_owner.data if type(m) is bpy.types.Mesh: for idx, uv in enumerate(m.uv_layers): - if uv.name == id: + if uv.name == socket.node.uv_map: uv_index = idx return exp_texcoord(exp_list, uv_index) @@ -2454,6 +2454,8 @@ def exp_math(socket, exp_list): "MULTIPLY", "DIVIDE", "ABSOLUTE", + "POWER", + "SIGN", "MINIMUM", "MAXIMUM", "FLOOR", @@ -2473,6 +2475,9 @@ def exp_math(socket, exp_list): "FRACTION": (1, "Frac"), } VECT_MATH_FUNCTIONS = { # tuples are (input_count, path) + "MULTIPLY_ADD": (3, "/DatasmithBlenderContent/MaterialFunctions/VectMultiplyAdd"), + "REFRACT": (3, "/DatasmithBlenderContent/MaterialFunctions/VectRefract"), + "FACEFORWARD": (3, "/DatasmithBlenderContent/MaterialFunctions/VectFaceforward"), "WRAP": (3, "/DatasmithBlenderContent/MaterialFunctions/VectWrap"), "SNAP": (2, "/DatasmithBlenderContent/MaterialFunctions/VectSnap"), "PROJECT": (2, "/DatasmithBlenderContent/MaterialFunctions/VectProject"), diff --git a/ue_template/Plugins/DatasmithBlenderContent/Content/MaterialFunctions/VectFaceforward.uasset b/ue_template/Plugins/DatasmithBlenderContent/Content/MaterialFunctions/VectFaceforward.uasset new file mode 100644 index 0000000..39ab9c5 Binary files /dev/null and b/ue_template/Plugins/DatasmithBlenderContent/Content/MaterialFunctions/VectFaceforward.uasset differ diff --git a/ue_template/Plugins/DatasmithBlenderContent/Content/MaterialFunctions/VectMultiplyAdd.uasset b/ue_template/Plugins/DatasmithBlenderContent/Content/MaterialFunctions/VectMultiplyAdd.uasset new file mode 100644 index 0000000..4b8a1a7 Binary files /dev/null and b/ue_template/Plugins/DatasmithBlenderContent/Content/MaterialFunctions/VectMultiplyAdd.uasset differ diff --git a/ue_template/Plugins/DatasmithBlenderContent/Content/MaterialFunctions/VectRefract.uasset b/ue_template/Plugins/DatasmithBlenderContent/Content/MaterialFunctions/VectRefract.uasset new file mode 100644 index 0000000..b7a2504 Binary files /dev/null and b/ue_template/Plugins/DatasmithBlenderContent/Content/MaterialFunctions/VectRefract.uasset differ