diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2024-07-07 12:38:47 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2024-07-07 12:38:47 +0200 |
| commit | 080b975c0949aef796806c08f7448b0b0a9eff87 (patch) | |
| tree | 5eb672390996679fdc2fc9338849b41ed086524e | |
| parent | 5bc5ea898c49eaef9df76ff6e5461278f6e6d7e4 (diff) | |
| parent | 7864abbeec103b2a3a2aa9713642a19b5a962b7e (diff) | |
| download | redot-engine-080b975c0949aef796806c08f7448b0b0a9eff87.tar.gz | |
Merge pull request #93998 from demolke/blender42
Update vertex color import to handle Blender 4.2 upwards
| -rw-r--r-- | modules/gltf/editor/editor_scene_importer_blend.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/modules/gltf/editor/editor_scene_importer_blend.cpp b/modules/gltf/editor/editor_scene_importer_blend.cpp index 79a2184745..519e2646a0 100644 --- a/modules/gltf/editor/editor_scene_importer_blend.cpp +++ b/modules/gltf/editor/editor_scene_importer_blend.cpp @@ -188,10 +188,18 @@ Node *EditorSceneFormatImporterBlend::import_scene(const String &p_path, uint32_ } else { parameters_map["export_lights"] = false; } - if (p_options.has(SNAME("blender/meshes/colors")) && p_options[SNAME("blender/meshes/colors")]) { - parameters_map["export_colors"] = true; + if (blender_major_version > 4 || (blender_major_version == 4 && blender_minor_version >= 2)) { + if (p_options.has(SNAME("blender/meshes/colors")) && p_options[SNAME("blender/meshes/colors")]) { + parameters_map["export_vertex_color"] = "MATERIAL"; + } else { + parameters_map["export_vertex_color"] = "NONE"; + } } else { - parameters_map["export_colors"] = false; + if (p_options.has(SNAME("blender/meshes/colors")) && p_options[SNAME("blender/meshes/colors")]) { + parameters_map["export_colors"] = true; + } else { + parameters_map["export_colors"] = false; + } } if (p_options.has(SNAME("blender/nodes/visible"))) { int32_t visible = p_options["blender/nodes/visible"]; |