style cleanup

[blender.git] / source / blender / collada / ControllerExporter.cpp

diff --git a/source/blender/collada/ControllerExporter.cpp b/source/blender/collada/ControllerExporter.cpp
index 39ed0334ae087b0384f37fb01b1838e17c52d839..71a16df3b265150992793e171dcc484247968d60 100644 (file)
--- a/source/blender/collada/ControllerExporter.cpp
+++ b/source/blender/collada/ControllerExporter.cpp
@@ -201,13 +201,12 @@ void ControllerExporter::export_skin_controller(Object *ob, Object *ob_arm)
        bool use_instantiation = this->export_settings->use_object_instantiation;
        Mesh *me;
 
-       if (this->export_settings->apply_modifiers) 
-               me = bc_to_mesh_apply_modifiers(scene, ob, this->export_settings->export_mesh_type);
-       else 
-               me = (Mesh *)ob->data;
+       me = bc_get_mesh_copy(scene,
+                               ob,
+                               this->export_settings->export_mesh_type,
+                               this->export_settings->apply_modifiers,
+                               this->export_settings->triangulate);
        
-       BKE_mesh_tessface_ensure(me);
-
        if (!me->dvert) return;
 
        std::string controller_name = id_name(ob_arm);
@@ -292,10 +291,8 @@ void ControllerExporter::export_skin_controller(Object *ob, Object *ob_arm)
        add_joints_element(&ob->defbase, joints_source_id, inv_bind_mat_source_id);
        add_vertex_weights_element(weights_source_id, joints_source_id, vcounts, joints);
 
-       if (this->export_settings->apply_modifiers)
-       {
-               BKE_libblock_free_us(&(G.main->mesh), me);
-       }
+       BKE_libblock_free_us(&(G.main->mesh), me);
+
        closeSkin();
        closeController();
 }
@@ -305,13 +302,11 @@ void ControllerExporter::export_morph_controller(Object *ob, Key *key)
        bool use_instantiation = this->export_settings->use_object_instantiation;
        Mesh *me;
 
-       if (this->export_settings->apply_modifiers) {
-               me = bc_to_mesh_apply_modifiers(scene, ob, this->export_settings->export_mesh_type);
-       } 
-       else {
-               me = (Mesh *)ob->data;
-       }
-       BKE_mesh_tessface_ensure(me);
+       me = bc_get_mesh_copy(scene,
+                               ob,
+                               this->export_settings->export_mesh_type,
+                               this->export_settings->apply_modifiers,
+                               this->export_settings->triangulate);
 
        std::string controller_name = id_name(ob) + "-morph";
        std::string controller_id = get_controller_id(key, ob);
@@ -332,10 +327,8 @@ void ControllerExporter::export_morph_controller(Object *ob, Key *key)
                                         COLLADASW::URI(COLLADABU::Utils::EMPTY_STRING, morph_weights_id)));
        targets.add();
 
-       if (this->export_settings->apply_modifiers)
-       {
-               BKE_libblock_free_us(&(G.main->mesh), me);
-       }
+       BKE_libblock_free_us(&(G.main->mesh), me);
+
 
        //support for animations
        //can also try the base element and param alternative
@@ -359,7 +352,7 @@ std::string ControllerExporter::add_morph_targets(Key *key, Object *ob)
 
        source.prepareToAppendValues();
 
-       KeyBlock * kb = (KeyBlock*)key->block.first;
+       KeyBlock *kb = (KeyBlock *)key->block.first;
        //skip the basis
        kb = kb->next;
        for (; kb; kb = kb->next) {
@@ -388,7 +381,7 @@ std::string ControllerExporter::add_morph_weights(Key *key, Object *ob)
        
        source.prepareToAppendValues();
 
-       KeyBlock * kb = (KeyBlock*)key->block.first;
+       KeyBlock *kb = (KeyBlock *)key->block.first;
        //skip the basis
        kb = kb->next;
        for (; kb; kb = kb->next) {
@@ -406,12 +399,12 @@ void ControllerExporter::add_weight_extras(Key *key)
        // can also try the base element and param alternative
        COLLADASW::BaseExtraTechnique extra;
        
-       KeyBlock * kb = (KeyBlock*)key->block.first;
+       KeyBlock * kb = (KeyBlock *)key->block.first;
        //skip the basis
        kb = kb->next;
        for (; kb; kb = kb->next) {
                // XXX why is the weight not used here and set to 0.0?
-               float weight = kb->curval;
+               // float weight = kb->curval;
                extra.addExtraTechniqueParameter ("KHR", "morph_weights" , 0.000, "MORPH_WEIGHT_TO_TARGET");
        }
 }