diff options
| author | Gaia Clary <gaia.clary@machinimatrix.org> | 2013-03-02 19:58:13 +0400 |
|---|---|---|
| committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2013-03-02 19:58:13 +0400 |
| commit | be701b6278769465495ec43d1d6817cf5fbfeaca (patch) | |
| tree | 70537dfc0e93b55d2f88fe16af25c5481c7c18f8 /source/blender/editors/io | |
| parent | 723e231ce0c92d72bb959096613e901ea781d84a (diff) | |
Collada: Added support for ngon export/import and added triangulate option to export
Diffstat (limited to 'source/blender/editors/io')
| -rw-r--r-- | source/blender/editors/io/io_collada.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/io/io_collada.c b/source/blender/editors/io/io_collada.c index 7eae20fc7f7..4908c101a7c 100644 --- a/source/blender/editors/io/io_collada.c +++ b/source/blender/editors/io/io_collada.c @@ -92,7 +92,7 @@ static int wm_collada_export_exec(bContext *C, wmOperator *op) int use_texture_copies; int active_uv_only; - int use_ngons; + int triangulate; int use_object_instantiation; int sort_by_name; int second_life; @@ -119,7 +119,7 @@ static int wm_collada_export_exec(bContext *C, wmOperator *op) use_texture_copies = RNA_boolean_get(op->ptr, "use_texture_copies"); active_uv_only = RNA_boolean_get(op->ptr, "active_uv_only"); - use_ngons = RNA_boolean_get(op->ptr, "use_ngons"); + triangulate = RNA_boolean_get(op->ptr, "triangulate"); use_object_instantiation = RNA_boolean_get(op->ptr, "use_object_instantiation"); sort_by_name = RNA_boolean_get(op->ptr, "sort_by_name"); second_life = RNA_boolean_get(op->ptr, "second_life"); @@ -142,7 +142,7 @@ static int wm_collada_export_exec(bContext *C, wmOperator *op) include_material_textures, use_texture_copies, - use_ngons, + triangulate, use_object_instantiation, sort_by_name, second_life)) @@ -221,7 +221,7 @@ static void uiCollada_exportSettings(uiLayout *layout, PointerRNA *imfptr) uiItemL(row, IFACE_("Collada Options:"), ICON_MODIFIER); row = uiLayoutRow(box, FALSE); - uiItemR(row, imfptr, "use_ngons", 0, NULL, ICON_NONE); + uiItemR(row, imfptr, "triangulate", 0, NULL, ICON_NONE); row = uiLayoutRow(box, FALSE); uiItemR(row, imfptr, "use_object_instantiation", 0, NULL, ICON_NONE); row = uiLayoutRow(box, FALSE); @@ -299,8 +299,8 @@ void WM_OT_collada_export(wmOperatorType *ot) "Copy textures to same folder where the .dae file is exported"); - RNA_def_boolean(ot->srna, "use_ngons", 1, "Use NGons", - "Export as NGons"); + RNA_def_boolean(ot->srna, "triangulate", 1, "Triangulate", + "Export Polygons (Quads & NGons) as Triangles"); RNA_def_boolean(ot->srna, "use_object_instantiation", 1, "Use Object Instances", "Instantiate multiple Objects from same Data"); |