blender
/
blender
136
405
Fork 586
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

Fix T96303: C++ OBJ exporter needs presets and skip modifiers. 

This patch, D14303, from Aras Pranckevicius adds presets to the OBJ exporter,
and also adds a checkbox (default on) to apply modifiers before export.
This commit is contained in:
Aras Pranckevicius 2022-03-13 12:04:52 -04:00 committed by Howard Trickey
parent 91dbc28363
commit 70720c42c2
Notes: blender-bot 2023-02-14 08:45:12 +01:00 
Referenced by issue #96483, obj exporter doesn't have the preset option anymore
Referenced by issue #96303, New 3.1+ OBJ exporter no longer has "operator presets" nor a way to skip modifiers
Referenced by issue #96241, 3.1: Potential candidates for corrective releases
4 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/editors/io/io_obj.c
View File

@ -96,6 +96,7 @@ static int wm_obj_export_exec(bContext *C, wmOperator *op)
export_params.forward_axis = RNA_enum_get(op->ptr, "forward_axis");
export_params.up_axis = RNA_enum_get(op->ptr, "up_axis");
export_params.scaling_factor = RNA_float_get(op->ptr, "scaling_factor");
export_params.apply_modifiers = RNA_boolean_get(op->ptr, "apply_modifiers");
export_params.export_eval_mode = RNA_enum_get(op->ptr, "export_eval_mode");
export_params.export_selected_objects = RNA_boolean_get(op->ptr, "export_selected_objects");
@ -147,6 +148,7 @@ static void ui_obj_export_settings(uiLayout *layout, PointerRNA *imfptr)
uiItemR(sub, imfptr, "scaling_factor", 0, NULL, ICON_NONE);
sub = uiLayoutColumnWithHeading(col, false, IFACE_("Objects"));
uiItemR(sub, imfptr, "export_selected_objects", 0, IFACE_("Selected Only"), ICON_NONE);
uiItemR(sub, imfptr, "apply_modifiers", 0, IFACE_("Apply Modifiers"), ICON_NONE);
uiItemR(sub, imfptr, "export_eval_mode", 0, IFACE_("Properties"), ICON_NONE);
/* Options for what to write. */
@ -239,6 +241,8 @@ void WM_OT_obj_export(struct wmOperatorType *ot)
ot->ui = wm_obj_export_draw;
ot->check = wm_obj_export_check;
ot->flag |= OPTYPE_PRESET;
WM_operator_properties_filesel(ot,
FILE_TYPE_FOLDER | FILE_TYPE_OBJECT_IO,
FILE_BLENDER,
@ -289,6 +293,11 @@ void WM_OT_obj_export(struct wmOperatorType *ot)
0.01,
1000.0f);
/* File Writer options. */
RNA_def_boolean(ot->srna,
"apply_modifiers",
true,
"Apply Modifiers",
"Apply modifiers to exported meshes");
RNA_def_enum(ot->srna,
"export_eval_mode",
io_obj_export_evaluation_mode,

1
source/blender/io/wavefront_obj/IO_wavefront_obj.h
View File

@ -55,6 +55,7 @@ struct OBJExportParams {
/* File Write Options. */
bool export_selected_objects;
bool apply_modifiers;
eEvaluationMode export_eval_mode;
bool export_uv;
bool export_normals;

4
source/blender/io/wavefront_obj/exporter/obj_export_mesh.cc
View File

@ -33,7 +33,9 @@ OBJMesh::OBJMesh(Depsgraph *depsgraph, const OBJExportParams &export_params, Obj
/* We need to copy the object because it may be in temporary space. */
Object *obj_eval = DEG_get_evaluated_object(depsgraph, mesh_object);
export_object_eval_ = *obj_eval;
export_mesh_eval_ = BKE_object_get_evaluated_mesh(&export_object_eval_);
export_mesh_eval_ = export_params.apply_modifiers ?
BKE_object_get_evaluated_mesh(&export_object_eval_) :
BKE_object_get_pre_modified_mesh(&export_object_eval_);
mesh_eval_needs_free_ = false;
if (!export_mesh_eval_) {

1
source/blender/io/wavefront_obj/tests/obj_exporter_tests.hh
View File

@ -86,6 +86,7 @@ struct OBJExportParamsDefault {
params.up_axis = OBJ_AXIS_Y_UP;
params.scaling_factor = 1.f;
params.apply_modifiers = true;
params.export_eval_mode = DAG_EVAL_VIEWPORT;
params.export_selected_objects = false;
params.export_uv = true;