diff options
Diffstat (limited to 'source/blender/collada/ArmatureImporter.cpp')
-rw-r--r-- | source/blender/collada/ArmatureImporter.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/source/blender/collada/ArmatureImporter.cpp b/source/blender/collada/ArmatureImporter.cpp index 6bf6087c054..19f174d4840 100644 --- a/source/blender/collada/ArmatureImporter.cpp +++ b/source/blender/collada/ArmatureImporter.cpp @@ -61,7 +61,7 @@ ArmatureImporter::ArmatureImporter(UnitConverter *conv, MeshImporterBase *mesh, view_layer(view_layer), unit_converter(conv), import_settings(import_settings), - empty(NULL), + empty(NULL), mesh_importer(mesh) { } @@ -103,7 +103,7 @@ int ArmatureImporter::create_bone(SkinInfo *skin, COLLADAFW::Node *node, EditBon std::vector<COLLADAFW::Node *>::iterator it; it = std::find(finished_joints.begin(), finished_joints.end(), node); if (it != finished_joints.end()) return chain_length; - + EditBone *bone = ED_armature_ebone_add(arm, bc_get_joint_name(node)); totbone++; @@ -141,7 +141,7 @@ int ArmatureImporter::create_bone(SkinInfo *skin, COLLADAFW::Node *node, EditBon if (parent) bone->parent = parent; - float loc[3], size[3], rot[3][3]; + float loc[3], size[3], rot[3][3]; BoneExtensionMap &extended_bones = bone_extension_manager.getExtensionMap(arm); BoneExtended &be = add_bone_extended(bone, node, totchild, layer_labels, extended_bones); int layer = be.get_bone_layers(); @@ -386,7 +386,7 @@ void ArmatureImporter::set_euler_rotmode() COLLADAFW::Node *joint = it->second; std::map<COLLADAFW::UniqueId, SkinInfo>::iterator sit; - + for (sit = skin_by_data_uid.begin(); sit != skin_by_data_uid.end(); sit++) { SkinInfo& skin = sit->second; @@ -410,7 +410,7 @@ void ArmatureImporter::set_euler_rotmode() Object *ArmatureImporter::get_empty_for_leaves() { if (empty) return empty; - + empty = bc_add_object(scene, view_layer, OB_EMPTY, NULL); empty->empty_drawtype = OB_EMPTY_SPHERE; @@ -456,7 +456,7 @@ void ArmatureImporter::create_armature_bones(Main *bmain, std::vector<Object *> //if there is an armature created for root_joint next root_joint for (ri = root_joints.begin(); ri != root_joints.end(); ri++) { if (get_armature_for_joint(*ri) != NULL) continue; - + Object *ob_arm = joint_parent_map[(*ri)->getUniqueId()]; if (!ob_arm) continue; @@ -572,8 +572,8 @@ Object *ArmatureImporter::create_armature_bones(Main *bmain, SkinInfo& skin) } if (!shared && this->joint_parent_map.size() > 0) { - // All armatures have been created while creating the Node tree. - // The Collada exporter currently does not create a + // All armatures have been created while creating the Node tree. + // The Collada exporter currently does not create a // strict relationship between geometries and armatures // So when we reimport a Blender collada file, then we have // to guess what is meant. @@ -657,12 +657,12 @@ void ArmatureImporter::set_pose(Object *ob_arm, COLLADAFW::Node *root_node, con } else { - + copy_m4_m4(mat, obmat); float invObmat[4][4]; invert_m4_m4(invObmat, ob_arm->obmat); mul_m4_m4m4(pchan->pose_mat, invObmat, mat); - + } //float angle = 0.0f; @@ -758,7 +758,7 @@ void ArmatureImporter::make_armatures(bContext *C, std::vector<Object *> &object // free memory stolen from SkinControllerData skin.free(); } - + //for bones without skins create_armature_bones(bmain, ob_arms); @@ -808,9 +808,9 @@ bool ArmatureImporter::write_skin_controller_data(const COLLADAFW::SkinControlle // don't forget to call defgroup_unique_name before we copy - // controller data uid -> [armature] -> joint data, + // controller data uid -> [armature] -> joint data, // [mesh object] - // + // SkinInfo skin(unit_converter); skin.borrow_skin_controller_data(data); @@ -868,7 +868,7 @@ void ArmatureImporter::make_shape_keys() //Prereq: all the geometries must be imported and mesh objects must be made Object *source_ob = this->mesh_importer->get_object_by_geom_uid((*mc)->getSource()); - + if (source_ob) { Mesh *source_me = (Mesh *)source_ob->data; @@ -876,7 +876,7 @@ void ArmatureImporter::make_shape_keys() Key *key = source_me->key = BKE_key_add((ID *)source_me); key->type = KEY_RELATIVE; KeyBlock *kb; - + //insert basis key kb = BKE_keyblock_add_ctime(key, "Basis", false); BKE_keyblock_convert_from_mesh(source_me, kb); @@ -887,14 +887,14 @@ void ArmatureImporter::make_shape_keys() //This'll do for now since only mesh morphing is imported Mesh *me = this->mesh_importer->get_mesh_by_geom_uid(morphTargetIds[i]); - + if (me) { me->key = key; std::string morph_name = *this->mesh_importer->get_geometry_name(me->id.name); kb = BKE_keyblock_add_ctime(key, morph_name.c_str(), false); BKE_keyblock_convert_from_mesh(me, kb); - + //apply weights weight = morphWeights.getFloatValues()->getData()[i]; kb->curval = weight; @@ -990,14 +990,14 @@ BoneExtended &ArmatureImporter::add_bone_extended(EditBone *bone, COLLADAFW::Nod has_connect = et->setData("connect", &connect_type); bool has_roll = et->setData("roll", &roll); - + layers = et->setData("layer", layers); if (has_tail && !has_connect) { /* got a bone tail definition but no connect info -> bone is not connected */ has_connect = true; - connect_type = 0; + connect_type = 0; } be->set_bone_layers(layers, layer_labels); |