diff options
Diffstat (limited to 'source/blender/collada/ControllerExporter.cpp')
-rw-r--r-- | source/blender/collada/ControllerExporter.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/source/blender/collada/ControllerExporter.cpp b/source/blender/collada/ControllerExporter.cpp index 14e8e0323a8..c89e0f1ec62 100644 --- a/source/blender/collada/ControllerExporter.cpp +++ b/source/blender/collada/ControllerExporter.cpp @@ -99,10 +99,10 @@ bool ControllerExporter::add_instance_controller(Object *ob) } InstanceWriter::add_material_bindings(ins.getBindMaterial(), - ob, + ob, this->export_settings->active_uv_only, this->export_settings->export_texture_type); - + ins.add(); return true; } @@ -150,7 +150,7 @@ void ArmatureExporter::find_objects_using_armature(Object *ob_arm, std::vector<O Base *base = (Base *) sce->base.first; while (base) { Object *ob = base->object; - + if (ob->type == OB_MESH && get_assigned_armature(ob) == ob_arm) { objects.push_back(ob); } @@ -205,7 +205,7 @@ void ControllerExporter::export_skin_controller(Object *ob, Object *ob_arm) this->export_settings->export_mesh_type, this->export_settings->apply_modifiers, this->export_settings->triangulate); - + if (!me->dvert) return; std::string controller_name = id_name(ob_arm); @@ -248,7 +248,7 @@ void ControllerExporter::export_skin_controller(Object *ob, Object *ob_arm) for (j = 0; j < vert->totweight; j++) { int idx = vert->dw[j].def_nr; if (idx >= joint_index_by_def_index.size()) { - // XXX: Maybe better find out where and + // XXX: Maybe better find out where and // why the Out Of Bound indexes get created ? oob_counter += 1; } @@ -316,7 +316,7 @@ void ControllerExporter::export_morph_controller(Object *ob, Key *key) std::string targets_id = add_morph_targets(key, ob); std::string morph_weights_id = add_morph_weights(key, ob); - + COLLADASW::TargetsElement targets(mSW); COLLADASW::InputList &input = targets.getInputList(); @@ -378,7 +378,7 @@ std::string ControllerExporter::add_morph_weights(Key *key, Object *ob) COLLADASW::SourceBase::ParameterNameList ¶m = source.getParameterNameList(); param.push_back("MORPH_WEIGHT"); - + source.prepareToAppendValues(); KeyBlock *kb = (KeyBlock *)key->block.first; @@ -398,7 +398,7 @@ 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; //skip the basis kb = kb->next; @@ -449,7 +449,7 @@ std::string ControllerExporter::add_joints_source(Object *ob_arm, ListBase *defb source.setArrayId(source_id + ARRAY_ID_SUFFIX); source.setAccessorCount(totjoint); source.setAccessorStride(1); - + COLLADASW::SourceBase::ParameterNameList ¶m = source.getParameterNameList(); param.push_back("JOINT"); @@ -482,7 +482,7 @@ std::string ControllerExporter::add_inv_bind_mats_source(Object *ob_arm, ListBas source.setArrayId(source_id + ARRAY_ID_SUFFIX); source.setAccessorCount(totjoint); //BLI_listbase_count(defbase)); source.setAccessorStride(16); - + source.setParameterTypeName(&COLLADASW::CSWC::CSW_VALUE_TYPE_FLOAT4x4); COLLADASW::SourceBase::ParameterNameList ¶m = source.getParameterNameList(); param.push_back("TRANSFORM"); @@ -511,7 +511,7 @@ std::string ControllerExporter::add_inv_bind_mats_source(Object *ob_arm, ListBas float bind_mat[4][4]; /* derived from bone->arm_mat */ bool has_bindmat = bc_get_property_matrix(pchan->bone, "bind_mat", bind_mat); - + if (!has_bindmat) { /* Have no bind matrix stored, try old style <= Blender 2.78 */ @@ -573,7 +573,7 @@ std::string ControllerExporter::add_weights_source(Mesh *me, const std::string& source.setArrayId(source_id + ARRAY_ID_SUFFIX); source.setAccessorCount(weights.size()); source.setAccessorStride(1); - + COLLADASW::SourceBase::ParameterNameList ¶m = source.getParameterNameList(); param.push_back("WEIGHT"); |