diff options
Diffstat (limited to 'source/blender/editors/io/io_collada.c')
| -rw-r--r-- | source/blender/editors/io/io_collada.c | 1306 |
1 files changed, 707 insertions, 599 deletions
diff --git a/source/blender/editors/io/io_collada.c b/source/blender/editors/io/io_collada.c index 3829821ef2e..6ccdf8628a8 100644 --- a/source/blender/editors/io/io_collada.c +++ b/source/blender/editors/io/io_collada.c @@ -21,673 +21,781 @@ * \ingroup collada */ #ifdef WITH_COLLADA -#include "DNA_space_types.h" +# include "DNA_space_types.h" -#include "BLT_translation.h" +# include "BLT_translation.h" -#include "BLI_blenlib.h" -#include "BLI_utildefines.h" +# include "BLI_blenlib.h" +# include "BLI_utildefines.h" -#include "BKE_context.h" -#include "BKE_global.h" -#include "BKE_main.h" -#include "BKE_object.h" -#include "BKE_report.h" +# include "BKE_context.h" +# include "BKE_global.h" +# include "BKE_main.h" +# include "BKE_object.h" +# include "BKE_report.h" -#include "DEG_depsgraph.h" +# include "DEG_depsgraph.h" -#include "ED_screen.h" -#include "ED_object.h" +# include "ED_screen.h" +# include "ED_object.h" -#include "RNA_access.h" -#include "RNA_define.h" +# include "RNA_access.h" +# include "RNA_define.h" -#include "UI_interface.h" -#include "UI_resources.h" +# include "UI_interface.h" +# include "UI_resources.h" -#include "WM_api.h" -#include "WM_types.h" +# include "WM_api.h" +# include "WM_types.h" -#include "../../collada/collada.h" +# include "../../collada/collada.h" -#include "io_collada.h" +# include "io_collada.h" static int wm_collada_export_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event)) { - Main *bmain = CTX_data_main(C); + Main *bmain = CTX_data_main(C); - if (!RNA_struct_property_is_set(op->ptr, "filepath")) { - char filepath[FILE_MAX]; - const char *blendfile_path = BKE_main_blendfile_path(bmain); + if (!RNA_struct_property_is_set(op->ptr, "filepath")) { + char filepath[FILE_MAX]; + const char *blendfile_path = BKE_main_blendfile_path(bmain); - if (blendfile_path[0] == '\0') - BLI_strncpy(filepath, "untitled", sizeof(filepath)); - else - BLI_strncpy(filepath, blendfile_path, sizeof(filepath)); + if (blendfile_path[0] == '\0') + BLI_strncpy(filepath, "untitled", sizeof(filepath)); + else + BLI_strncpy(filepath, blendfile_path, sizeof(filepath)); - BLI_path_extension_replace(filepath, sizeof(filepath), ".dae"); - RNA_string_set(op->ptr, "filepath", filepath); - } + BLI_path_extension_replace(filepath, sizeof(filepath), ".dae"); + RNA_string_set(op->ptr, "filepath", filepath); + } - WM_event_add_fileselect(C, op); + WM_event_add_fileselect(C, op); - return OPERATOR_RUNNING_MODAL; + return OPERATOR_RUNNING_MODAL; } /* function used for WM_OT_save_mainfile too */ static int wm_collada_export_exec(bContext *C, wmOperator *op) { - char filepath[FILE_MAX]; - int apply_modifiers; - int export_mesh_type; - int selected; - int include_children; - int include_armatures; - int include_shapekeys; - int deform_bones_only; - - int include_animations; - int include_all_actions; - int sampling_rate; - int keep_smooth_curves; - int keep_keyframes; - int keep_flat_curves; - - int export_animation_type; - int use_texture_copies; - int active_uv_only; - - int triangulate; - int use_object_instantiation; - int use_blender_profile; - int sort_by_name; - int export_transformation_type; - - int open_sim; - int limit_precision; - int keep_bind_info; - - int export_count; - int sample_animations; - - if (!RNA_struct_property_is_set(op->ptr, "filepath")) { - BKE_report(op->reports, RPT_ERROR, "No filename given"); - return OPERATOR_CANCELLED; - } - - RNA_string_get(op->ptr, "filepath", filepath); - BLI_path_extension_ensure(filepath, sizeof(filepath), ".dae"); - - - /* Avoid File write exceptions in Collada */ - if (!BLI_exists(filepath)) { - BLI_make_existing_file(filepath); - if (!BLI_file_touch(filepath)) { - BKE_report(op->reports, RPT_ERROR, "Can't create export file"); - fprintf(stdout, "Collada export: Can not create: %s\n", filepath); - return OPERATOR_CANCELLED; - } - } - else if (!BLI_file_is_writable(filepath)) { - BKE_report(op->reports, RPT_ERROR, "Can't overwrite export file"); - fprintf(stdout, "Collada export: Can not modify: %s\n", filepath); - return OPERATOR_CANCELLED; - } - - /* Now the exporter can create and write the export file */ - - /* Options panel */ - apply_modifiers = RNA_boolean_get(op->ptr, "apply_modifiers"); - export_mesh_type = RNA_enum_get(op->ptr, "export_mesh_type_selection"); - selected = RNA_boolean_get(op->ptr, "selected"); - include_children = RNA_boolean_get(op->ptr, "include_children"); - include_armatures = RNA_boolean_get(op->ptr, "include_armatures"); - include_shapekeys = RNA_boolean_get(op->ptr, "include_shapekeys"); - - include_animations = RNA_boolean_get(op->ptr, "include_animations"); - include_all_actions = RNA_boolean_get(op->ptr, "include_all_actions"); - export_animation_type = RNA_enum_get(op->ptr, "export_animation_type_selection"); - sample_animations = (export_animation_type == BC_ANIMATION_EXPORT_SAMPLES); - sampling_rate = (sample_animations) ? RNA_int_get(op->ptr, "sampling_rate") : 0; - keep_smooth_curves = RNA_boolean_get(op->ptr, "keep_smooth_curves"); - keep_keyframes = RNA_boolean_get(op->ptr, "keep_keyframes"); - keep_flat_curves = RNA_boolean_get(op->ptr, "keep_flat_curves"); - - deform_bones_only = RNA_boolean_get(op->ptr, "deform_bones_only"); - - use_texture_copies = RNA_boolean_get(op->ptr, "use_texture_copies"); - active_uv_only = RNA_boolean_get(op->ptr, "active_uv_only"); - - triangulate = RNA_boolean_get(op->ptr, "triangulate"); - use_object_instantiation = RNA_boolean_get(op->ptr, "use_object_instantiation"); - use_blender_profile = RNA_boolean_get(op->ptr, "use_blender_profile"); - sort_by_name = RNA_boolean_get(op->ptr, "sort_by_name"); - export_transformation_type = RNA_enum_get(op->ptr, "export_transformation_type_selection"); - open_sim = RNA_boolean_get(op->ptr, "open_sim"); - - limit_precision = RNA_boolean_get(op->ptr, "limit_precision"); - keep_bind_info = RNA_boolean_get(op->ptr, "keep_bind_info"); - - Main *bmain = CTX_data_main(C); - - /* get editmode results */ - ED_object_editmode_load(bmain, CTX_data_edit_object(C)); - - //Scene *scene = CTX_data_scene(C); - - ExportSettings export_settings; - - export_settings.filepath = filepath; - - export_settings.apply_modifiers = apply_modifiers != 0; - export_settings.export_mesh_type = export_mesh_type; - export_settings.selected = selected != 0; - export_settings.include_children = include_children != 0; - export_settings.include_armatures = include_armatures != 0; - export_settings.include_shapekeys = include_shapekeys != 0; - export_settings.deform_bones_only = deform_bones_only != 0; - export_settings.include_animations = include_animations != 0; - export_settings.include_all_actions = include_all_actions != 0; - export_settings.sampling_rate = sampling_rate; - export_settings.keep_keyframes = keep_keyframes != 0 || sampling_rate < 1; - export_settings.keep_flat_curves = keep_flat_curves != 0; - - export_settings.active_uv_only = active_uv_only != 0; - export_settings.export_animation_type = export_animation_type; - export_settings.use_texture_copies = use_texture_copies != 0; - - export_settings.triangulate = triangulate != 0; - export_settings.use_object_instantiation = use_object_instantiation != 0; - export_settings.use_blender_profile = use_blender_profile != 0; - export_settings.sort_by_name = sort_by_name != 0; - - if (export_animation_type == BC_ANIMATION_EXPORT_SAMPLES) { - export_settings.export_transformation_type = export_transformation_type; - } - else { - // When curves are exported then we can not export as matrix - export_settings.export_transformation_type = BC_TRANSFORMATION_TYPE_TRANSROTLOC; - } - - if (export_settings.export_transformation_type == BC_TRANSFORMATION_TYPE_TRANSROTLOC) { - export_settings.keep_smooth_curves = keep_smooth_curves != 0; - } - else { - // Can not export smooth curves when Matrix export is enabled. - export_settings.keep_smooth_curves = false; - } - - export_settings.open_sim = open_sim != 0; - export_settings.limit_precision = limit_precision != 0; - export_settings.keep_bind_info = keep_bind_info != 0; - - int includeFilter = OB_REL_NONE; - if (export_settings.include_armatures) includeFilter |= OB_REL_MOD_ARMATURE; - if (export_settings.include_children) includeFilter |= OB_REL_CHILDREN_RECURSIVE; - - export_count = collada_export( - C, - &export_settings - ); - - if (export_count == 0) { - BKE_report(op->reports, RPT_WARNING, "No objects selected -- Created empty export file"); - return OPERATOR_CANCELLED; - } - else if (export_count < 0) { - BKE_report(op->reports, RPT_WARNING, "Error during export (see Console)"); - return OPERATOR_CANCELLED; - } - else { - char buff[100]; - sprintf(buff, "Exported %d Objects", export_count); - BKE_report(op->reports, RPT_INFO, buff); - return OPERATOR_FINISHED; - } + char filepath[FILE_MAX]; + int apply_modifiers; + int export_mesh_type; + int selected; + int include_children; + int include_armatures; + int include_shapekeys; + int deform_bones_only; + + int include_animations; + int include_all_actions; + int sampling_rate; + int keep_smooth_curves; + int keep_keyframes; + int keep_flat_curves; + + int export_animation_type; + int use_texture_copies; + int active_uv_only; + + int triangulate; + int use_object_instantiation; + int use_blender_profile; + int sort_by_name; + int export_transformation_type; + + int open_sim; + int limit_precision; + int keep_bind_info; + + int export_count; + int sample_animations; + + if (!RNA_struct_property_is_set(op->ptr, "filepath")) { + BKE_report(op->reports, RPT_ERROR, "No filename given"); + return OPERATOR_CANCELLED; + } + + RNA_string_get(op->ptr, "filepath", filepath); + BLI_path_extension_ensure(filepath, sizeof(filepath), ".dae"); + + /* Avoid File write exceptions in Collada */ + if (!BLI_exists(filepath)) { + BLI_make_existing_file(filepath); + if (!BLI_file_touch(filepath)) { + BKE_report(op->reports, RPT_ERROR, "Can't create export file"); + fprintf(stdout, "Collada export: Can not create: %s\n", filepath); + return OPERATOR_CANCELLED; + } + } + else if (!BLI_file_is_writable(filepath)) { + BKE_report(op->reports, RPT_ERROR, "Can't overwrite export file"); + fprintf(stdout, "Collada export: Can not modify: %s\n", filepath); + return OPERATOR_CANCELLED; + } + + /* Now the exporter can create and write the export file */ + + /* Options panel */ + apply_modifiers = RNA_boolean_get(op->ptr, "apply_modifiers"); + export_mesh_type = RNA_enum_get(op->ptr, "export_mesh_type_selection"); + selected = RNA_boolean_get(op->ptr, "selected"); + include_children = RNA_boolean_get(op->ptr, "include_children"); + include_armatures = RNA_boolean_get(op->ptr, "include_armatures"); + include_shapekeys = RNA_boolean_get(op->ptr, "include_shapekeys"); + + include_animations = RNA_boolean_get(op->ptr, "include_animations"); + include_all_actions = RNA_boolean_get(op->ptr, "include_all_actions"); + export_animation_type = RNA_enum_get(op->ptr, "export_animation_type_selection"); + sample_animations = (export_animation_type == BC_ANIMATION_EXPORT_SAMPLES); + sampling_rate = (sample_animations) ? RNA_int_get(op->ptr, "sampling_rate") : 0; + keep_smooth_curves = RNA_boolean_get(op->ptr, "keep_smooth_curves"); + keep_keyframes = RNA_boolean_get(op->ptr, "keep_keyframes"); + keep_flat_curves = RNA_boolean_get(op->ptr, "keep_flat_curves"); + + deform_bones_only = RNA_boolean_get(op->ptr, "deform_bones_only"); + + use_texture_copies = RNA_boolean_get(op->ptr, "use_texture_copies"); + active_uv_only = RNA_boolean_get(op->ptr, "active_uv_only"); + + triangulate = RNA_boolean_get(op->ptr, "triangulate"); + use_object_instantiation = RNA_boolean_get(op->ptr, "use_object_instantiation"); + use_blender_profile = RNA_boolean_get(op->ptr, "use_blender_profile"); + sort_by_name = RNA_boolean_get(op->ptr, "sort_by_name"); + export_transformation_type = RNA_enum_get(op->ptr, "export_transformation_type_selection"); + open_sim = RNA_boolean_get(op->ptr, "open_sim"); + + limit_precision = RNA_boolean_get(op->ptr, "limit_precision"); + keep_bind_info = RNA_boolean_get(op->ptr, "keep_bind_info"); + + Main *bmain = CTX_data_main(C); + + /* get editmode results */ + ED_object_editmode_load(bmain, CTX_data_edit_object(C)); + + //Scene *scene = CTX_data_scene(C); + + ExportSettings export_settings; + + export_settings.filepath = filepath; + + export_settings.apply_modifiers = apply_modifiers != 0; + export_settings.export_mesh_type = export_mesh_type; + export_settings.selected = selected != 0; + export_settings.include_children = include_children != 0; + export_settings.include_armatures = include_armatures != 0; + export_settings.include_shapekeys = include_shapekeys != 0; + export_settings.deform_bones_only = deform_bones_only != 0; + export_settings.include_animations = include_animations != 0; + export_settings.include_all_actions = include_all_actions != 0; + export_settings.sampling_rate = sampling_rate; + export_settings.keep_keyframes = keep_keyframes != 0 || sampling_rate < 1; + export_settings.keep_flat_curves = keep_flat_curves != 0; + + export_settings.active_uv_only = active_uv_only != 0; + export_settings.export_animation_type = export_animation_type; + export_settings.use_texture_copies = use_texture_copies != 0; + + export_settings.triangulate = triangulate != 0; + export_settings.use_object_instantiation = use_object_instantiation != 0; + export_settings.use_blender_profile = use_blender_profile != 0; + export_settings.sort_by_name = sort_by_name != 0; + + if (export_animation_type == BC_ANIMATION_EXPORT_SAMPLES) { + export_settings.export_transformation_type = export_transformation_type; + } + else { + // When curves are exported then we can not export as matrix + export_settings.export_transformation_type = BC_TRANSFORMATION_TYPE_TRANSROTLOC; + } + + if (export_settings.export_transformation_type == BC_TRANSFORMATION_TYPE_TRANSROTLOC) { + export_settings.keep_smooth_curves = keep_smooth_curves != 0; + } + else { + // Can not export smooth curves when Matrix export is enabled. + export_settings.keep_smooth_curves = false; + } + + export_settings.open_sim = open_sim != 0; + export_settings.limit_precision = limit_precision != 0; + export_settings.keep_bind_info = keep_bind_info != 0; + + int includeFilter = OB_REL_NONE; + if (export_settings.include_armatures) + includeFilter |= OB_REL_MOD_ARMATURE; + if (export_settings.include_children) + includeFilter |= OB_REL_CHILDREN_RECURSIVE; + + export_count = collada_export(C, &export_settings); + + if (export_count == 0) { + BKE_report(op->reports, RPT_WARNING, "No objects selected -- Created empty export file"); + return OPERATOR_CANCELLED; + } + else if (export_count < 0) { + BKE_report(op->reports, RPT_WARNING, "Error during export (see Console)"); + return OPERATOR_CANCELLED; + } + else { + char buff[100]; + sprintf(buff, "Exported %d Objects", export_count); + BKE_report(op->reports, RPT_INFO, buff); + return OPERATOR_FINISHED; + } } static void uiCollada_exportSettings(uiLayout *layout, PointerRNA *imfptr) { - uiLayout *box, *row, *col, *split; - bool include_animations = RNA_boolean_get(imfptr, "include_animations"); - int ui_section = RNA_enum_get(imfptr, "prop_bc_export_ui_section"); - - BC_export_animation_type animation_type = RNA_enum_get(imfptr, "export_animation_type_selection"); - BC_export_transformation_type transformation_type = RNA_enum_get(imfptr, "export_transformation_type_selection"); - - bool sampling = animation_type == BC_ANIMATION_EXPORT_SAMPLES; - - /* Export Options: */ - box = uiLayoutBox(layout); - - row = uiLayoutRow(box, false); - uiItemR(row, imfptr, "prop_bc_export_ui_section", UI_ITEM_R_EXPAND, NULL, ICON_NONE); - - if (ui_section == BC_UI_SECTION_MAIN) { - /* =================== */ - /* Export Data options */ - /* =================== */ - - row = uiLayoutRow(box, false); - uiItemR(row, imfptr, "selected", 0, NULL, ICON_NONE); - - row = uiLayoutRow(box, false); - uiItemR(row, imfptr, "include_children", 0, NULL, ICON_NONE); - uiLayoutSetEnabled(row, RNA_boolean_get(imfptr, "selected")); - - row = uiLayoutRow(box, false); - uiItemR(row, imfptr, "include_armatures", 0, NULL, ICON_NONE); - uiLayoutSetEnabled(row, RNA_boolean_get(imfptr, "selected")); - - row = uiLayoutRow(box, false); - uiItemR(row, imfptr, "include_shapekeys", 0, NULL, ICON_NONE); - uiLayoutSetEnabled(row, RNA_boolean_get(imfptr, "selected")); - - /* Texture options */ - box = uiLayoutBox(layout); - row = uiLayoutRow(box, false); - uiItemL(row, IFACE_("Texture Options:"), ICON_TEXTURE_DATA); - - row = uiLayoutRow(box, false); - uiItemR(row, imfptr, "active_uv_only", 0, NULL, ICON_NONE); - - row = uiLayoutRow(box, false); - uiItemR(row, imfptr, "use_texture_copies", 1, NULL, ICON_NONE); - - } - else if (ui_section == BC_UI_SECTION_GEOMETRY) { - row = uiLayoutRow(box, false); - uiItemL(row, IFACE_("Export Data Options:"), ICON_MESH_DATA); - - row = uiLayoutRow(box, false); - split = uiLayoutSplit(row, 0.6f, UI_LAYOUT_ALIGN_RIGHT); - col = uiLayoutColumn(split, false); - uiItemR(col, imfptr, "apply_modifiers", 0, NULL, ICON_NONE); - col = uiLayoutColumn(split, false); - uiItemR(col, imfptr, "export_mesh_type_selection", 0, "", ICON_NONE); - uiLayoutSetEnabled(col, RNA_boolean_get(imfptr, "apply_modifiers")); - row = uiLayoutRow(box, false); - uiItemR(row, imfptr, "triangulate", 1, NULL, ICON_NONE); - } - else if (ui_section == BC_UI_SECTION_ARMATURE) { - /* Armature options */ - box = uiLayoutBox(layout); - row = uiLayoutRow(box, false); - uiItemL(row, IFACE_("Armature Options:"), ICON_ARMATURE_DATA); - - row = uiLayoutRow(box, false); - uiItemR(row, imfptr, "deform_bones_only", 0, NULL, ICON_NONE); - - row = uiLayoutRow(box, false); - uiItemR(row, imfptr, "open_sim", 0, NULL, ICON_NONE); - } - else if (ui_section == BC_UI_SECTION_ANIMATION) { - - /* ====================== */ - /* Animation Data options */ - /* ====================== */ - - row = uiLayoutRow(box, false); - uiItemR(row, imfptr, "include_animations", 0, NULL, ICON_NONE); - - - row = uiLayoutRow(box, false); - uiItemR(row, imfptr, "export_animation_type_selection", UI_ITEM_R_EXPAND, NULL, ICON_NONE); - - row = uiLayoutRow(box, false); - split = uiLayoutSplit(row, 0.6f, UI_LAYOUT_ALIGN_RIGHT); - uiItemL(split, IFACE_("Transformation Type"), ICON_NONE); - uiItemR(split, imfptr, "export_transformation_type_selection", 0, "", ICON_NONE); - uiLayoutSetEnabled(row, animation_type == BC_ANIMATION_EXPORT_SAMPLES); - - row = uiLayoutColumn(box, false); - uiItemR(row, imfptr, "keep_smooth_curves", 0, NULL, ICON_NONE); - uiLayoutSetEnabled(row, include_animations && - (transformation_type == BC_TRANSFORMATION_TYPE_TRANSROTLOC || animation_type == BC_ANIMATION_EXPORT_KEYS)); - - row = uiLayoutColumn(box, false); - uiItemR(row, imfptr, "sampling_rate", 0, NULL, ICON_NONE); - uiLayoutSetEnabled(row, sampling && include_animations); - - row = uiLayoutColumn(box, false); - uiItemR(row, imfptr, "keep_keyframes", 0, NULL, ICON_NONE); - uiLayoutSetEnabled(row, sampling && include_animations); - - row = uiLayoutColumn(box, false); - uiItemR(row, imfptr, "keep_flat_curves", 0, NULL, ICON_NONE); - - row = uiLayoutRow(box, false); - uiItemR(row, imfptr, "include_all_actions", 0, NULL, ICON_NONE); - uiLayoutSetEnabled(row, include_animations); - - } - else if (ui_section == BC_UI_SECTION_COLLADA) { - /* Collada options: */ - box = uiLayoutBox(layout); - row = uiLayoutRow(box, false); - uiItemL(row, IFACE_("Collada Options:"), ICON_MODIFIER); - - row = uiLayoutRow(box, false); - uiItemR(row, imfptr, "use_object_instantiation", 1, NULL, ICON_NONE); - row = uiLayoutRow(box, false); - uiItemR(row, imfptr, "use_blender_profile", 1, NULL, ICON_NONE); - - row = uiLayoutRow(box, false); - uiItemR(row, imfptr, "sort_by_name", 0, NULL, ICON_NONE); - - row = uiLayoutRow(box, false); - uiItemR(row, imfptr, "keep_bind_info", 0, NULL, ICON_NONE); - - row = uiLayoutRow(box, false); - uiItemR(row, imfptr, "limit_precision", 0, NULL, ICON_NONE); - } + uiLayout *box, *row, *col, *split; + bool include_animations = RNA_boolean_get(imfptr, "include_animations"); + int ui_section = RNA_enum_get(imfptr, "prop_bc_export_ui_section"); + + BC_export_animation_type animation_type = RNA_enum_get(imfptr, + "export_animation_type_selection"); + BC_export_transformation_type transformation_type = RNA_enum_get( + imfptr, "export_transformation_type_selection"); + + bool sampling = animation_type == BC_ANIMATION_EXPORT_SAMPLES; + + /* Export Options: */ + box = uiLayoutBox(layout); + + row = uiLayoutRow(box, false); + uiItemR(row, imfptr, "prop_bc_export_ui_section", UI_ITEM_R_EXPAND, NULL, ICON_NONE); + + if (ui_section == BC_UI_SECTION_MAIN) { + /* =================== */ + /* Export Data options */ + /* =================== */ + + row = uiLayoutRow(box, false); + uiItemR(row, imfptr, "selected", 0, NULL, ICON_NONE); + + row = uiLayoutRow(box, false); + uiItemR(row, imfptr, "include_children", 0, NULL, ICON_NONE); + uiLayoutSetEnabled(row, RNA_boolean_get(imfptr, "selected")); + + row = uiLayoutRow(box, false); + uiItemR(row, imfptr, "include_armatures", 0, NULL, ICON_NONE); + uiLayoutSetEnabled(row, RNA_boolean_get(imfptr, "selected")); + + row = uiLayoutRow(box, false); + uiItemR(row, imfptr, "include_shapekeys", 0, NULL, ICON_NONE); + uiLayoutSetEnabled(row, RNA_boolean_get(imfptr, "selected")); + + /* Texture options */ + box = uiLayoutBox(layout); + row = uiLayoutRow(box, false); + uiItemL(row, IFACE_("Texture Options:"), ICON_TEXTURE_DATA); + + row = uiLayoutRow(box, false); + uiItemR(row, imfptr, "active_uv_only", 0, NULL, ICON_NONE); + + row = uiLayoutRow(box, false); + uiItemR(row, imfptr, "use_texture_copies", 1, NULL, ICON_NONE); + } + else if (ui_section == BC_UI_SECTION_GEOMETRY) { + row = uiLayoutRow(box, false); + uiItemL(row, IFACE_("Export Data Options:"), ICON_MESH_DATA); + + row = uiLayoutRow(box, false); + split = uiLayoutSplit(row, 0.6f, UI_LAYOUT_ALIGN_RIGHT); + col = uiLayoutColumn(split, false); + uiItemR(col, imfptr, "apply_modifiers", 0, NULL, ICON_NONE); + col = uiLayoutColumn(split, false); + uiItemR(col, imfptr, "export_mesh_type_selection", 0, "", ICON_NONE); + uiLayoutSetEnabled(col, RNA_boolean_get(imfptr, "apply_modifiers")); + row = uiLayoutRow(box, false); + uiItemR(row, imfptr, "triangulate", 1, NULL, ICON_NONE); + } + else if (ui_section == BC_UI_SECTION_ARMATURE) { + /* Armature options */ + box = uiLayoutBox(layout); + row = uiLayoutRow(box, false); + uiItemL(row, IFACE_("Armature Options:"), ICON_ARMATURE_DATA); + + row = uiLayoutRow(box, false); + uiItemR(row, imfptr, "deform_bones_only", 0, NULL, ICON_NONE); + + row = uiLayoutRow(box, false); + uiItemR(row, imfptr, "open_sim", 0, NULL, ICON_NONE); + } + else if (ui_section == BC_UI_SECTION_ANIMATION) { + + /* ====================== */ + /* Animation Data options */ + /* ====================== */ + + row = uiLayoutRow(box, false); + uiItemR(row, imfptr, "include_animations", 0, NULL, ICON_NONE); + + row = uiLayoutRow(box, false); + uiItemR(row, imfptr, "export_animation_type_selection", UI_ITEM_R_EXPAND, NULL, ICON_NONE); + + row = uiLayoutRow(box, false); + split = uiLayoutSplit(row, 0.6f, UI_LAYOUT_ALIGN_RIGHT); + uiItemL(split, IFACE_("Transformation Type"), ICON_NONE); + uiItemR(split, imfptr, "export_transformation_type_selection", 0, "", ICON_NONE); + uiLayoutSetEnabled(row, animation_type == BC_ANIMATION_EXPORT_SAMPLES); + + row = uiLayoutColumn(box, false); + uiItemR(row, imfptr, "keep_smooth_curves", 0, NULL, ICON_NONE); + uiLayoutSetEnabled(row, + include_animations && + (transformation_type == BC_TRANSFORMATION_TYPE_TRANSROTLOC || + animation_type == BC_ANIMATION_EXPORT_KEYS)); + + row = uiLayoutColumn(box, false); + uiItemR(row, imfptr, "sampling_rate", 0, NULL, ICON_NONE); + uiLayoutSetEnabled(row, sampling && include_animations); + + row = uiLayoutColumn(box, false); + uiItemR(row, imfptr, "keep_keyframes", 0, NULL, ICON_NONE); + uiLayoutSetEnabled(row, sampling && include_animations); + + row = uiLayoutColumn(box, false); + uiItemR(row, imfptr, "keep_flat_curves", 0, NULL, ICON_NONE); + + row = uiLayoutRow(box, false); + uiItemR(row, imfptr, "include_all_actions", 0, NULL, ICON_NONE); + uiLayoutSetEnabled(row, include_animations); + } + else if (ui_section == BC_UI_SECTION_COLLADA) { + /* Collada options: */ + box = uiLayoutBox(layout); + row = uiLayoutRow(box, false); + uiItemL(row, IFACE_("Collada Options:"), ICON_MODIFIER); + + row = uiLayoutRow(box, false); + uiItemR(row, imfptr, "use_object_instantiation", 1, NULL, ICON_NONE); + row = uiLayoutRow(box, false); + uiItemR(row, imfptr, "use_blender_profile", 1, NULL, ICON_NONE); + + row = uiLayoutRow(box, false); + uiItemR(row, imfptr, "sort_by_name", 0, NULL, ICON_NONE); + + row = uiLayoutRow(box, false); + uiItemR(row, imfptr, "keep_bind_info", 0, NULL, ICON_NONE); + + row = uiLayoutRow(box, false); + uiItemR(row, imfptr, "limit_precision", 0, NULL, ICON_NONE); + } } static void wm_collada_export_draw(bContext *UNUSED(C), wmOperator *op) { - PointerRNA ptr; + PointerRNA ptr; - RNA_pointer_create(NULL, op->type->srna, op->properties, &ptr); - uiCollada_exportSettings(op->layout, &ptr); + RNA_pointer_create(NULL, op->type->srna, op->properties, &ptr); + uiCollada_exportSettings(op->layout, &ptr); } static bool wm_collada_export_check(bContext *UNUSED(C), wmOperator *op) { - char filepath[FILE_MAX]; - RNA_string_get(op->ptr, "filepath", filepath); + char filepath[FILE_MAX]; + RNA_string_get(op->ptr, "filepath", filepath); - if (!BLI_path_extension_check(filepath, ".dae")) { - BLI_path_extension_ensure(filepath, FILE_MAX, ".dae"); - RNA_string_set(op->ptr, "filepath", filepath); - return true; - } + if (!BLI_path_extension_check(filepath, ".dae")) { + BLI_path_extension_ensure(filepath, FILE_MAX, ".dae"); + RNA_string_set(op->ptr, "filepath", filepath); + return true; + } - return false; + return false; } void WM_OT_collada_export(wmOperatorType *ot) { - struct StructRNA *func = ot->srna; - - static const EnumPropertyItem prop_bc_export_mesh_type[] = { - {BC_MESH_TYPE_VIEW, "view", 0, "View", "Apply modifier's view settings"}, - {BC_MESH_TYPE_RENDER, "render", 0, "Render", "Apply modifier's render settings"}, - {0, NULL, 0, NULL, NULL}, - }; - - static const EnumPropertyItem prop_bc_export_transformation_type[] = { - { BC_TRANSFORMATION_TYPE_MATRIX, "matrix", 0, "Matrix", "Use <matrix> to specify transformations" }, - { BC_TRANSFORMATION_TYPE_TRANSROTLOC, "transrotloc", 0, "TransRotLoc", "Use <translate>, <rotate>, <scale> to specify transformations" }, - { 0, NULL, 0, NULL, NULL } - }; - - static const EnumPropertyItem prop_bc_export_animation_type[] = { - { BC_ANIMATION_EXPORT_SAMPLES, "sample", 0, "Samples", "Export Sampled points guided by sampling rate" }, - { BC_ANIMATION_EXPORT_KEYS, "keys", 0, "Curves", "Export Curves (note: guided by curve keys)" }, - { 0, NULL, 0, NULL, NULL } - }; - - static const EnumPropertyItem prop_bc_export_ui_section[] = { - { BC_UI_SECTION_MAIN, "main", 0, "Main", "Data Export Section" }, - { BC_UI_SECTION_GEOMETRY, "geometry", 0, "Geom", "Geometry Export Section" }, - { BC_UI_SECTION_ARMATURE, "armature", 0, "Arm", "Armature Export Section" }, - { BC_UI_SECTION_ANIMATION, "animation", 0, "Anim", "Animation Export Section" }, - { BC_UI_SECTION_COLLADA, "collada", 0, "Extra", "Collada Export Section" }, - { 0, NULL, 0, NULL, NULL } - }; - - - ot->name = "Export COLLADA"; - ot->description = "Save a Collada file"; - ot->idname = "WM_OT_collada_export"; - - ot->invoke = wm_collada_export_invoke; - ot->exec = wm_collada_export_exec; - ot->poll = WM_operator_winactive; - ot->check = wm_collada_export_check; - - ot->flag |= OPTYPE_PRESET; - - ot->ui = wm_collada_export_draw; - - WM_operator_properties_filesel( - ot, FILE_TYPE_FOLDER | FILE_TYPE_COLLADA, FILE_BLENDER, FILE_SAVE, - WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY, FILE_SORT_ALPHA); - - RNA_def_enum(func, "prop_bc_export_ui_section", prop_bc_export_ui_section, 0, - "Export Section", "Only for User Interface organization"); - - RNA_def_boolean(func, "apply_modifiers", 0, "Apply Modifiers", - "Apply modifiers to exported mesh (non destructive))"); - - RNA_def_int(func, "export_mesh_type", 0, INT_MIN, INT_MAX, - "Resolution", "Modifier resolution for export", INT_MIN, INT_MAX); - - RNA_def_enum(func, "export_mesh_type_selection", prop_bc_export_mesh_type, 0, - "Resolution", "Modifier resolution for export"); - - RNA_def_boolean(func, "selected", false, "Selection Only", - "Export only selected elements"); - - RNA_def_boolean(func, "include_children", false, "Include Children", - "Export all children of selected objects (even if not selected)"); - - RNA_def_boolean(func, "include_armatures", false, "Include Armatures", - "Export related armatures (even if not selected)"); - - RNA_def_boolean(func, "include_shapekeys", false, "Include Shape Keys", - "Export all Shape Keys from Mesh Objects"); - - RNA_def_boolean(func, "deform_bones_only", false, "Deform Bones only", - "Only export deforming bones with armatures"); - - - - RNA_def_boolean(func, "include_animations", true, "Include Animations", - "Export animations if available (exporting animations will enforce the decomposition of " - "node transforms into <translation> <rotation> and <scale> components)"); - - RNA_def_boolean(func, "include_all_actions", true, "Include all Actions", - "Export also unassigned actions (this allows you to export entire animation libraries for your character(s))"); - - RNA_def_enum(func, "export_animation_type_selection", prop_bc_export_animation_type, 0, "Key Type", - "Type for exported animations (use sample keys or Curve keys)"); - - RNA_def_int(func, "sampling_rate", 1, 1, INT_MAX, "Sampling Rate", - "The distance between 2 keyframes (1 to key every frame)", 1, INT_MAX); - - RNA_def_boolean(func, "keep_smooth_curves", 0, "Keep Smooth curves", - "Export also the curve handles (if available) (this does only work when the inverse parent matrix " - "is the unity matrix, otherwise you may end up with odd results)"); - - RNA_def_boolean( - func, "keep_keyframes", 0, "Keep Keyframes", - "Use existing keyframes as additional sample points (this helps when you want to keep manual tweaks)"); - - RNA_def_boolean( - func, "keep_flat_curves", 0, "All keyed curves", - "Export also curves which have only one key or are totally flat"); - - RNA_def_boolean(func, "active_uv_only", 0, "Only Selected UV Map", - "Export only the selected UV Map"); - - RNA_def_boolean(func, "use_texture_copies", 1, "Copy", - "Copy textures to same folder where the .dae file is exported"); - - - RNA_def_boolean(func, "triangulate", 1, "Triangulate", - "Export Polygons (Quads & NGons) as Triangles"); - - RNA_def_boolean(func, "use_object_instantiation", 1, "Use Object Instances", - "Instantiate multiple Objects from same Data"); - - RNA_def_boolean(func, "use_blender_profile", 1, "Use Blender Profile", - "Export additional Blender specific information (for material, shaders, bones, etc.)"); - - RNA_def_boolean(func, "sort_by_name", 0, "Sort by Object name", - "Sort exported data by Object name"); - - RNA_def_int(func, "export_transformation_type", 0, INT_MIN, INT_MAX, "Transform", - "Transformation type for translation, scale and rotation", INT_MIN, INT_MAX); - - RNA_def_enum(func, "export_transformation_type_selection", prop_bc_export_transformation_type, 0, "Transform", - "Transformation type for translation, scale and rotation"); - - RNA_def_boolean(func, "open_sim", 0, "Export to SL/OpenSim", - "Compatibility mode for SL, OpenSim and other compatible online worlds"); - - RNA_def_boolean(func, "limit_precision", 0, "Limit Precision", - "Reduce the precision of the exported data to 6 digits"); - - RNA_def_boolean(func, "keep_bind_info", 0, "Keep Bind Info", - "Store Bindpose information in custom bone properties for later use during Collada export"); + struct StructRNA *func = ot->srna; + + static const EnumPropertyItem prop_bc_export_mesh_type[] = { + {BC_MESH_TYPE_VIEW, "view", 0, "View", "Apply modifier's view settings"}, + {BC_MESH_TYPE_RENDER, "render", 0, "Render", "Apply modifier's render settings"}, + {0, NULL, 0, NULL, NULL}, + }; + + static const EnumPropertyItem prop_bc_export_transformation_type[] = { + {BC_TRANSFORMATION_TYPE_MATRIX, + "matrix", + 0, + "Matrix", + "Use <matrix> to specify transformations"}, + {BC_TRANSFORMATION_TYPE_TRANSROTLOC, + "transrotloc", + 0, + "TransRotLoc", + "Use <translate>, <rotate>, <scale> to specify transformations"}, + {0, NULL, 0, NULL, NULL}}; + + static const EnumPropertyItem prop_bc_export_animation_type[] = { + {BC_ANIMATION_EXPORT_SAMPLES, + "sample", + 0, + "Samples", + "Export Sampled points guided by sampling rate"}, + {BC_ANIMATION_EXPORT_KEYS, + "keys", + 0, + "Curves", + "Export Curves (note: guided by curve keys)"}, + {0, NULL, 0, NULL, NULL}}; + + static const EnumPropertyItem prop_bc_export_ui_section[] = { + {BC_UI_SECTION_MAIN, "main", 0, "Main", "Data Export Section"}, + {BC_UI_SECTION_GEOMETRY, "geometry", 0, "Geom", "Geometry Export Section"}, + {BC_UI_SECTION_ARMATURE, "armature", 0, "Arm", "Armature Export Section"}, + {BC_UI_SECTION_ANIMATION, "animation", 0, "Anim", "Animation Export Section"}, + {BC_UI_SECTION_COLLADA, "collada", 0, "Extra", "Collada Export Section"}, + {0, NULL, 0, NULL, NULL}}; + + ot->name = "Export COLLADA"; + ot->description = "Save a Collada file"; + ot->idname = "WM_OT_collada_export"; + + ot->invoke = wm_collada_export_invoke; + ot->exec = wm_collada_export_exec; + ot->poll = WM_operator_winactive; + ot->check = wm_collada_export_check; + + ot->flag |= OPTYPE_PRESET; + + ot->ui = wm_collada_export_draw; + + WM_operator_properties_filesel(ot, + FILE_TYPE_FOLDER | FILE_TYPE_COLLADA, + FILE_BLENDER, + FILE_SAVE, + WM_FILESEL_FILEPATH, + FILE_DEFAULTDISPLAY, + FILE_SORT_ALPHA); + + RNA_def_enum(func, + "prop_bc_export_ui_section", + prop_bc_export_ui_section, + 0, + "Export Section", + "Only for User Interface organization"); + + RNA_def_boolean(func, + "apply_modifiers", + 0, + "Apply Modifiers", + "Apply modifiers to exported mesh (non destructive))"); + + RNA_def_int(func, + "export_mesh_type", + 0, + INT_MIN, + INT_MAX, + "Resolution", + "Modifier resolution for export", + INT_MIN, + INT_MAX); + + RNA_def_enum(func, + "export_mesh_type_selection", + prop_bc_export_mesh_type, + 0, + "Resolution", + "Modifier resolution for export"); + + RNA_def_boolean(func, "selected", false, "Selection Only", "Export only selected elements"); + + RNA_def_boolean(func, + "include_children", + false, + "Include Children", + "Export all children of selected objects (even if not selected)"); + + RNA_def_boolean(func, + "include_armatures", + false, + "Include Armatures", + "Export related armatures (even if not selected)"); + + RNA_def_boolean(func, + "include_shapekeys", + false, + "Include Shape Keys", + "Export all Shape Keys from Mesh Objects"); + + RNA_def_boolean(func, + "deform_bones_only", + false, + "Deform Bones only", + "Only export deforming bones with armatures"); + + RNA_def_boolean( + func, + "include_animations", + true, + "Include Animations", + "Export animations if available (exporting animations will enforce the decomposition of " + "node transforms into <translation> <rotation> and <scale> components)"); + + RNA_def_boolean(func, + "include_all_actions", + true, + "Include all Actions", + "Export also unassigned actions (this allows you to export entire animation " + "libraries for your character(s))"); + + RNA_def_enum(func, + "export_animation_type_selection", + prop_bc_export_animation_type, + 0, + "Key Type", + "Type for exported animations (use sample keys or Curve keys)"); + + RNA_def_int(func, + "sampling_rate", + 1, + 1, + INT_MAX, + "Sampling Rate", + "The distance between 2 keyframes (1 to key every frame)", + 1, + INT_MAX); + + RNA_def_boolean(func, + "keep_smooth_curves", + 0, + "Keep Smooth curves", + "Export also the curve handles (if available) (this does only work when the " + "inverse parent matrix " + "is the unity matrix, otherwise you may end up with odd results)"); + + RNA_def_boolean(func, + "keep_keyframes", + 0, + "Keep Keyframes", + "Use existing keyframes as additional sample points (this helps when you want " + "to keep manual tweaks)"); + + RNA_def_boolean(func, + "keep_flat_curves", + 0, + "All keyed curves", + "Export also curves which have only one key or are totally flat"); + + RNA_def_boolean( + func, "active_uv_only", 0, "Only Selected UV Map", "Export only the selected UV Map"); + + RNA_def_boolean(func, + "use_texture_copies", + 1, + "Copy", + "Copy textures to same folder where the .dae file is exported"); + + RNA_def_boolean( + func, "triangulate", 1, "Triangulate", "Export Polygons (Quads & NGons) as Triangles"); + + RNA_def_boolean(func, + "use_object_instantiation", + 1, + "Use Object Instances", + "Instantiate multiple Objects from same Data"); + + RNA_def_boolean( + func, + "use_blender_profile", + 1, + "Use Blender Profile", + "Export additional Blender specific information (for material, shaders, bones, etc.)"); + + RNA_def_boolean( + func, "sort_by_name", 0, "Sort by Object name", "Sort exported data by Object name"); + + RNA_def_int(func, + "export_transformation_type", + 0, + INT_MIN, + INT_MAX, + "Transform", + "Transformation type for translation, scale and rotation", + INT_MIN, + INT_MAX); + + RNA_def_enum(func, + "export_transformation_type_selection", + prop_bc_export_transformation_type, + 0, + "Transform", + "Transformation type for translation, scale and rotation"); + + RNA_def_boolean(func, + "open_sim", + 0, + "Export to SL/OpenSim", + "Compatibility mode for SL, OpenSim and other compatible online worlds"); + + RNA_def_boolean(func, + "limit_precision", + 0, + "Limit Precision", + "Reduce the precision of the exported data to 6 digits"); + + RNA_def_boolean( + func, + "keep_bind_info", + 0, + "Keep Bind Info", + "Store Bindpose information in custom bone properties for later use during Collada export"); } - /* function used for WM_OT_save_mainfile too */ static int wm_collada_import_exec(bContext *C, wmOperator *op) { - char filename[FILE_MAX]; - int import_units; - int find_chains; - int auto_connect; - int fix_orientation; - int min_chain_length; - - int keep_bind_info; - ImportSettings import_settings; - - if (!RNA_struct_property_is_set(op->ptr, "filepath")) { - BKE_report(op->reports, RPT_ERROR, "No filename given"); - return OPERATOR_CANCELLED; - } - - /* Options panel */ - import_units = RNA_boolean_get(op->ptr, "import_units"); - find_chains = RNA_boolean_get(op->ptr, "find_chains"); - auto_connect = RNA_boolean_get(op->ptr, "auto_connect"); - fix_orientation = RNA_boolean_get(op->ptr, "fix_orientation"); - - keep_bind_info = RNA_boolean_get(op->ptr, "keep_bind_info"); - - min_chain_length = RNA_int_get(op->ptr, "min_chain_length"); - - RNA_string_get(op->ptr, "filepath", filename); - - import_settings.filepath = filename; - import_settings.import_units = import_units != 0; - import_settings.auto_connect = auto_connect != 0; - import_settings.find_chains = find_chains != 0; - import_settings.fix_orientation = fix_orientation != 0; - import_settings.min_chain_length = min_chain_length; - import_settings.keep_bind_info = keep_bind_info != 0; - - if (collada_import(C, &import_settings)) { - DEG_id_tag_update(&CTX_data_scene(C)->id, ID_RECALC_BASE_FLAGS); - return OPERATOR_FINISHED; - } - else { - BKE_report(op->reports, RPT_ERROR, "Parsing errors in Document (see Blender Console)"); - return OPERATOR_CANCELLED; - } + char filename[FILE_MAX]; + int import_units; + int find_chains; + int auto_connect; + int fix_orientation; + int min_chain_length; + + int keep_bind_info; + ImportSettings import_settings; + + if (!RNA_struct_property_is_set(op->ptr, "filepath")) { + BKE_report(op->reports, RPT_ERROR, "No filename given"); + return OPERATOR_CANCELLED; + } + + /* Options panel */ + import_units = RNA_boolean_get(op->ptr, "import_units"); + find_chains = RNA_boolean_get(op->ptr, "find_chains"); + auto_connect = RNA_boolean_get(op->ptr, "auto_connect"); + fix_orientation = RNA_boolean_get(op->ptr, "fix_orientation"); + + keep_bind_info = RNA_boolean_get(op->ptr, "keep_bind_info"); + + min_chain_length = RNA_int_get(op->ptr, "min_chain_length"); + + RNA_string_get(op->ptr, "filepath", filename); + + import_settings.filepath = filename; + import_settings.import_units = import_units != 0; + import_settings.auto_connect = auto_connect != 0; + import_settings.find_chains = find_chains != 0; + import_settings.fix_orientation = fix_orientation != 0; + import_settings.min_chain_length = min_chain_length; + import_settings.keep_bind_info = keep_bind_info != 0; + + if (collada_import(C, &import_settings)) { + DEG_id_tag_update(&CTX_data_scene(C)->id, ID_RECALC_BASE_FLAGS); + return OPERATOR_FINISHED; + } + else { + BKE_report(op->reports, RPT_ERROR, "Parsing errors in Document (see Blender Console)"); + return OPERATOR_CANCELLED; + } } static void uiCollada_importSettings(uiLayout *layout, PointerRNA *imfptr) { - uiLayout *box, *row; + uiLayout *box, *row; - /* Import Options: */ - box = uiLayoutBox(layout); - row = uiLayoutRow(box, false); - uiItemL(row, IFACE_("Import Data Options:"), ICON_MESH_DATA); + /* Import Options: */ + box = uiLayoutBox(layout); + row = uiLayoutRow(box, false); + uiItemL(row, IFACE_("Import Data Options:"), ICON_MESH_DATA); - row = uiLayoutRow(box, false); - uiItemR(row, imfptr, "import_units", 0, NULL, ICON_NONE); + row = uiLayoutRow(box, false); + uiItemR(row, imfptr, "import_units", 0, NULL, ICON_NONE); - box = uiLayoutBox(layout); - row = uiLayoutRow(box, false); - uiItemL(row, IFACE_("Armature Options:"), ICON_MESH_DATA); + box = uiLayoutBox(layout); + row = uiLayoutRow(box, false); + uiItemL(row, IFACE_("Armature Options:"), ICON_MESH_DATA); - row = uiLayoutRow(box, false); - uiItemR(row, imfptr, "fix_orientation", 0, NULL, ICON_NONE); + row = uiLayoutRow(box, false); + uiItemR(row, imfptr, "fix_orientation", 0, NULL, ICON_NONE); - row = uiLayoutRow(box, false); - uiItemR(row, imfptr, "find_chains", 0, NULL, ICON_NONE); + row = uiLayoutRow(box, false); + uiItemR(row, imfptr, "find_chains", 0, NULL, ICON_NONE); - row = uiLayoutRow(box, false); - uiItemR(row, imfptr, "auto_connect", 0, NULL, ICON_NONE); + row = uiLayoutRow(box, false); + uiItemR(row, imfptr, "auto_connect", 0, NULL, ICON_NONE); - row = uiLayoutRow(box, false); - uiItemR(row, imfptr, "min_chain_length", 0, NULL, ICON_NONE); + row = uiLayoutRow(box, false); + uiItemR(row, imfptr, "min_chain_length", 0, NULL, ICON_NONE); - box = uiLayoutBox(layout); - row = uiLayoutRow(box, false); - - row = uiLayoutRow(box, false); - uiItemR(row, imfptr, "keep_bind_info", 0, NULL, ICON_NONE); + box = uiLayoutBox(layout); + row = uiLayoutRow(box, false); + row = uiLayoutRow(box, false); + uiItemR(row, imfptr, "keep_bind_info", 0, NULL, ICON_NONE); } static void wm_collada_import_draw(bContext *UNUSED(C), wmOperator *op) { - PointerRNA ptr; + PointerRNA ptr; - RNA_pointer_create(NULL, op->type->srna, op->properties, &ptr); - uiCollada_importSettings(op->layout, &ptr); + RNA_pointer_create(NULL, op->type->srna, op->properties, &ptr); + uiCollada_importSettings(op->layout, &ptr); } void WM_OT_collada_import(wmOperatorType *ot) { - ot->name = "Import COLLADA"; - ot->description = "Load a Collada file"; - ot->idname = "WM_OT_collada_import"; - - ot->invoke = WM_operator_filesel; - ot->exec = wm_collada_import_exec; - ot->poll = WM_operator_winactive; - - //ot->flag |= OPTYPE_PRESET; - - ot->ui = wm_collada_import_draw; - - WM_operator_properties_filesel( - ot, FILE_TYPE_FOLDER | FILE_TYPE_COLLADA, FILE_BLENDER, FILE_OPENFILE, - WM_FILESEL_FILEPATH, FILE_DEFAULTDISPLAY, FILE_SORT_ALPHA); - - RNA_def_boolean( - ot->srna, - "import_units", 0, "Import Units", - "If disabled match import to Blender's current Unit settings, " - "otherwise use the settings from the Imported scene"); - - RNA_def_boolean( - ot->srna, - "fix_orientation", 0, "Fix Leaf Bones", - "Fix Orientation of Leaf Bones (Collada does only support Joints)"); - - RNA_def_boolean( - ot->srna, - "find_chains", 0, "Find Bone Chains", - "Find best matching Bone Chains and ensure bones in chain are connected"); - - RNA_def_boolean( - ot->srna, - "auto_connect", 0, "Auto Connect", - "Set use_connect for parent bones which have exactly one child bone"); - - RNA_def_int( - ot->srna, - "min_chain_length", - 0, - 0, INT_MAX, - "Minimum Chain Length", - "When searching Bone Chains disregard chains of length below this value", - 0, INT_MAX); - - RNA_def_boolean( - ot->srna, - "keep_bind_info", 0, "Keep Bind Info", - "Store Bindpose information in custom bone properties for later use during Collada export"); - + ot->name = "Import COLLADA"; + ot->description = "Load a Collada file"; + ot->idname = "WM_OT_collada_import"; + + ot->invoke = WM_operator_filesel; + ot->exec = wm_collada_import_exec; + ot->poll = WM_operator_winactive; + + //ot->flag |= OPTYPE_PRESET; + + ot->ui = wm_collada_import_draw; + + WM_operator_properties_filesel(ot, + FILE_TYPE_FOLDER | FILE_TYPE_COLLADA, + FILE_BLENDER, + FILE_OPENFILE, + WM_FILESEL_FILEPATH, + FILE_DEFAULTDISPLAY, + FILE_SORT_ALPHA); + + RNA_def_boolean(ot->srna, + "import_units", + 0, + "Import Units", + "If disabled match import to Blender's current Unit settings, " + "otherwise use the settings from the Imported scene"); + + RNA_def_boolean(ot->srna, + "fix_orientation", + 0, + "Fix Leaf Bones", + "Fix Orientation of Leaf Bones (Collada does only support Joints)"); + + RNA_def_boolean(ot->srna, + "find_chains", + 0, + "Find Bone Chains", + "Find best matching Bone Chains and ensure bones in chain are connected"); + + RNA_def_boolean(ot->srna, + "auto_connect", + 0, + "Auto Connect", + "Set use_connect for parent bones which have exactly one child bone"); + + RNA_def_int(ot->srna, + "min_chain_length", + 0, + 0, + INT_MAX, + "Minimum Chain Length", + "When searching Bone Chains disregard chains of length below this value", + 0, + INT_MAX); + + RNA_def_boolean( + ot->srna, + "keep_bind_info", + 0, + "Keep Bind Info", + "Store Bindpose information in custom bone properties for later use during Collada export"); } #endif |