godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Add named placeholder to blender import options

This commit is contained in:
yesfish 2025-03-12 13:18:36 +00:00
parent 0a30831bed
commit f180e8a79d
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
modules/gltf/editor/editor_scene_importer_blend.cpp
View File

@ -175,10 +175,17 @@ Node *EditorSceneFormatImporterBlend::import_scene(const String &p_path, uint32_
}
if (p_options.has(SNAME("blender/materials/export_materials"))) {
int32_t exports = p_options["blender/materials/export_materials"];
if (exports == BLEND_MATERIAL_EXPORT_PLACEHOLDER) {
parameters_map["export_materials"] = "PLACEHOLDER";
} else if (exports == BLEND_MATERIAL_EXPORT_EXPORT) {
parameters_map["export_materials"] = "EXPORT";
switch (exports) {
case BLEND_MATERIAL_EXPORT_PLACEHOLDER: {
parameters_map["export_materials"] = "PLACEHOLDER";
} break;
case BLEND_MATERIAL_EXPORT_EXPORT: {
parameters_map["export_materials"] = "EXPORT";
} break;
case BLEND_MATERIAL_EXPORT_NAMED_PLACEHOLDER: {
parameters_map["export_materials"] = "EXPORT";
parameters_map["export_image_format"] = "NONE";
} break;
}
} else {
parameters_map["export_materials"] = "PLACEHOLDER";
@ -367,7 +374,7 @@ void EditorSceneFormatImporterBlend::get_import_options(const String &p_path, Li
ADD_OPTION_ENUM("blender/meshes/skins", "None,4 Influences (Compatible),All Influences", BLEND_BONE_INFLUENCES_ALL);
ADD_OPTION_BOOL("blender/meshes/export_bones_deforming_mesh_only", false);
ADD_OPTION_BOOL("blender/materials/unpack_enabled", true);
ADD_OPTION_ENUM("blender/materials/export_materials", "Placeholder,Export", BLEND_MATERIAL_EXPORT_EXPORT);
ADD_OPTION_ENUM("blender/materials/export_materials", "Placeholder,Export,Named Placeholder", BLEND_MATERIAL_EXPORT_EXPORT);
ADD_OPTION_BOOL("blender/animation/limit_playback", true);
ADD_OPTION_BOOL("blender/animation/always_sample", true);
ADD_OPTION_BOOL("blender/animation/group_tracks", true);

3
modules/gltf/editor/editor_scene_importer_blend.h
View File

@ -59,7 +59,8 @@ public:
};
enum {
BLEND_MATERIAL_EXPORT_PLACEHOLDER,
BLEND_MATERIAL_EXPORT_EXPORT
BLEND_MATERIAL_EXPORT_EXPORT,
BLEND_MATERIAL_EXPORT_NAMED_PLACEHOLDER,
};
enum {
BLEND_MODIFIERS_NONE,