diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:17:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:21:24 +0300 |
commit | e12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch) | |
tree | 8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/collada/collada.cpp | |
parent | b3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff) |
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211.
For details on usage and instructions for migrating branches
without conflicts, see:
https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/collada/collada.cpp')
-rw-r--r-- | source/blender/collada/collada.cpp | 116 |
1 files changed, 58 insertions, 58 deletions
diff --git a/source/blender/collada/collada.cpp b/source/blender/collada/collada.cpp index 69030bd2f47..294d105befd 100644 --- a/source/blender/collada/collada.cpp +++ b/source/blender/collada/collada.cpp @@ -18,7 +18,6 @@ * \ingroup collada */ - /* COLLADABU_ASSERT, may be able to remove later */ #include "COLLADABUPlatform.h" @@ -28,8 +27,7 @@ #include "ImportSettings.h" #include "collada.h" -extern "C" -{ +extern "C" { #include "BKE_scene.h" #include "BKE_context.h" #include "DEG_depsgraph.h" @@ -39,75 +37,77 @@ extern "C" #include "BLI_fileops.h" #include "BLI_linklist.h" - static void print_import_header(ImportSettings &import_settings) { - fprintf(stderr, "+-- Collada Import parameters------\n"); - fprintf(stderr, "| input file : %s\n", import_settings.filepath); - fprintf(stderr, "| use units : %s\n", (import_settings.import_units)?"yes":"no"); - fprintf(stderr, "| autoconnect : %s\n", (import_settings.auto_connect) ? "yes" : "no"); - fprintf(stderr, "+-- Armature Import parameters ----\n"); - fprintf(stderr, "| find bone chains: %s\n", (import_settings.find_chains) ? "yes" : "no"); - fprintf(stderr, "| min chain len : %d\n", import_settings.min_chain_length); - fprintf(stderr, "| fix orientation : %s\n", (import_settings.fix_orientation) ? "yes" : "no"); - fprintf(stderr, "| keep bind info : %s\n", (import_settings.keep_bind_info) ? "yes" : "no"); - + fprintf(stderr, "+-- Collada Import parameters------\n"); + fprintf(stderr, "| input file : %s\n", import_settings.filepath); + fprintf(stderr, "| use units : %s\n", (import_settings.import_units) ? "yes" : "no"); + fprintf(stderr, "| autoconnect : %s\n", (import_settings.auto_connect) ? "yes" : "no"); + fprintf(stderr, "+-- Armature Import parameters ----\n"); + fprintf(stderr, "| find bone chains: %s\n", (import_settings.find_chains) ? "yes" : "no"); + fprintf(stderr, "| min chain len : %d\n", import_settings.min_chain_length); + fprintf(stderr, "| fix orientation : %s\n", (import_settings.fix_orientation) ? "yes" : "no"); + fprintf(stderr, "| keep bind info : %s\n", (import_settings.keep_bind_info) ? "yes" : "no"); } static void print_import_footer(int status) { - fprintf(stderr, "+----------------------------------\n"); - fprintf(stderr, "| Collada Import : %s\n", (status)? "OK":"FAIL"); - fprintf(stderr, "+----------------------------------\n"); + fprintf(stderr, "+----------------------------------\n"); + fprintf(stderr, "| Collada Import : %s\n", (status) ? "OK" : "FAIL"); + fprintf(stderr, "+----------------------------------\n"); } int collada_import(bContext *C, ImportSettings *import_settings) { - print_import_header(*import_settings); - DocumentImporter imp(C, import_settings); - int status = imp.import()? 1:0; - print_import_footer(status); + print_import_header(*import_settings); + DocumentImporter imp(C, import_settings); + int status = imp.import() ? 1 : 0; + print_import_footer(status); - return status; + return status; } -int collada_export(bContext *C, - ExportSettings *export_settings) +int collada_export(bContext *C, ExportSettings *export_settings) { - BlenderContext blender_context(C); - ViewLayer *view_layer = blender_context.get_view_layer(); - - 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; - - /* Fetch the complete set of exported objects - * ATTENTION: Invisible objects will not be exported - */ - eObjectSet objectSet = (export_settings->selected) ? OB_SET_SELECTED : OB_SET_ALL; - export_settings->export_set = BKE_object_relational_superset(view_layer, objectSet, (eObRelationTypes)includeFilter); - - int export_count = BLI_linklist_count(export_settings->export_set); - - if (export_count == 0) { - if (export_settings->selected) { - fprintf(stderr, "Collada: Found no objects to export.\nPlease ensure that all objects which shall be exported are also visible in the 3D Viewport.\n"); - } - else { - fprintf(stderr, "Collada: Your scene seems to be empty. No Objects will be exported.\n"); - } - } - else { - if (export_settings->sort_by_name) - bc_bubble_sort_by_Object_name(export_settings->export_set); - } - - DocumentExporter exporter(blender_context, export_settings); - int status = exporter.exportCurrentScene(); - - BLI_linklist_free(export_settings->export_set, NULL); - - return (status) ? -1:export_count; + BlenderContext blender_context(C); + ViewLayer *view_layer = blender_context.get_view_layer(); + + 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; + + /* Fetch the complete set of exported objects + * ATTENTION: Invisible objects will not be exported + */ + eObjectSet objectSet = (export_settings->selected) ? OB_SET_SELECTED : OB_SET_ALL; + export_settings->export_set = BKE_object_relational_superset( + view_layer, objectSet, (eObRelationTypes)includeFilter); + + int export_count = BLI_linklist_count(export_settings->export_set); + + if (export_count == 0) { + if (export_settings->selected) { + fprintf(stderr, + "Collada: Found no objects to export.\nPlease ensure that all objects which shall " + "be exported are also visible in the 3D Viewport.\n"); + } + else { + fprintf(stderr, "Collada: Your scene seems to be empty. No Objects will be exported.\n"); + } + } + else { + if (export_settings->sort_by_name) + bc_bubble_sort_by_Object_name(export_settings->export_set); + } + + DocumentExporter exporter(blender_context, export_settings); + int status = exporter.exportCurrentScene(); + + BLI_linklist_free(export_settings->export_set, NULL); + + return (status) ? -1 : export_count; } /* end extern C */ |