From 52a5b30862c24e262978d1e9cbdeb8aebc6bc29a Mon Sep 17 00:00:00 2001 From: luboslenco Date: Fri, 17 Jul 2026 09:06:05 +0200 Subject: [PATCH] paint: remove blend material import --- paint/sources/functions.h | 1 - paint/sources/io/import_blend_material.c | 81 ------------------------ paint/sources/main.c | 1 - paint/sources/project.c | 7 +- 4 files changed, 2 insertions(+), 88 deletions(-) delete mode 100644 paint/sources/io/import_blend_material.c diff --git a/paint/sources/functions.h b/paint/sources/functions.h index 829d26da..d8223482 100644 --- a/paint/sources/functions.h +++ b/paint/sources/functions.h @@ -155,7 +155,6 @@ void tab_brushes_draw(ui_handle_t *htab); void pipes_init(); i32 pipes_get_constant_location(char *type); void make_brush_run(node_shader_t *kong); -void import_blend_material_run(char *path); void import_json_material_run(char *path); void import_texture_run(char *path, bool hdr_as_envmap); void import_lut_run(const char *path); diff --git a/paint/sources/io/import_blend_material.c b/paint/sources/io/import_blend_material.c deleted file mode 100644 index 7aa603b2..00000000 --- a/paint/sources/io/import_blend_material.c +++ /dev/null @@ -1,81 +0,0 @@ - -#include "../global.h" - -char *_import_blend_material_path; - -void _import_blend_material_on_next_frame(void *_) { - char *save; - if (path_is_protected()) { - save = string_copy(iron_internal_save_path()); - } - else { - save = string_copy(path_data()); - } - save = string("%s%s", save, "blender"); - iron_create_directory(save); - - char *py = string("\ -import bpy;\n\ -bpy.context.scene.render.engine = 'CYCLES'\n\ -bpy.context.scene.cycles.samples = 4\n\ -bpy.ops.mesh.primitive_plane_add()\n\ -plane = bpy.context.selected_objects[0]\n\ -img = bpy.data.images.new('bake', 2048, 2048)\n\ -img.file_format = 'JPEG'\n\ -for mat in bpy.data.materials:\n\ - if mat.name == 'Dots Stroke':\n\ - continue\n\ - plane.data.materials.append(mat)\n\ - node = mat.node_tree.nodes.new(type='ShaderNodeTexImage')\n\ - node.image = img\n\ - mat.node_tree.nodes.active = node\n\ - bpy.ops.object.bake(type='DIFFUSE')\n\ - img.filepath_raw = '%s/blender_base.jpg'\n\ - img.save()\n\ - bpy.ops.object.bake(type='ROUGHNESS')\n\ - img.filepath_raw = '%s/blender_rough.jpg'\n\ - img.save()\n\ - bpy.ops.object.bake(type='NORMAL')\n\ - img.filepath_raw = '%s/blender_nor.jpg'\n\ - img.save()\n\ - break\n\ -", - save, save, save); - - iron_sys_command(string("\"%s\" \"%s\" -b --python-expr \"%s\"", g_config->blender, _import_blend_material_path, py)); - import_folder_run(save); -} - -void _import_blend_material() { - console_toast(tr("Baking material")); - sys_notify_on_next_frame(&_import_blend_material_on_next_frame, NULL); -} - -void import_blend_material_run_box() { - if (ui_tab(ui_handle(__ID__), tr("Import Material"), false, -1, false)) { - import_blend_mesh_ui(); - - ui_row2(); - if (ui_icon_button(tr("Cancel"), ICON_CLOSE, UI_ALIGN_CENTER)) { - ui_box_hide(); - } - if (ui_icon_button(tr("Import"), ICON_CHECK, UI_ALIGN_CENTER) || g_ui->is_return_down) { - - ui_box_hide(); - - if (g_config->blender == NULL || string_equals(g_config->blender, "")) { - console_error(tr("Blender executable path not set")); - return; - } - _import_blend_material(); - } - } -} - -void import_blend_material_run(char *path) { - gc_unroot(_import_blend_material_path); - _import_blend_material_path = string_copy(path); - gc_root(_import_blend_material_path); - - ui_box_show_custom(&import_blend_material_run_box, 400, 200, NULL, true, ""); -} diff --git a/paint/sources/main.c b/paint/sources/main.c index 702e094b..ac06bd70 100644 --- a/paint/sources/main.c +++ b/paint/sources/main.c @@ -9,7 +9,6 @@ #include "io/export_texture.c" #include "io/import_arm.c" #include "io/import_asset.c" -#include "io/import_blend_material.c" #include "io/import_blend_mesh.c" #include "io/import_envmap.c" #include "io/import_folder.c" diff --git a/paint/sources/project.c b/paint/sources/project.c index ae50a271..71899d74 100644 --- a/paint/sources/project.c +++ b/paint/sources/project.c @@ -286,10 +286,7 @@ void project_set_default_envmap() { } void project_import_material_on_file_picked(char *path) { - if (ends_with(path, ".blend")) { - import_blend_material_run(path); - } - else if (ends_with(path, ".json")) { + if (ends_with(path, ".json")) { import_json_material_run(path); } else { @@ -298,7 +295,7 @@ void project_import_material_on_file_picked(char *path) { } void project_import_material() { - ui_files_show("arm,blend,json", false, true, &project_import_material_on_file_picked); + ui_files_show("arm,json", false, true, &project_import_material_on_file_picked); } ui_node_link_t *project_create_node_link(ui_node_link_t_array_t *links, i32 from_id, i32 from_socket, i32 to_id, i32 to_socket) {