Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2013-02-10 21:06:05 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-02-10 21:06:05 +0400
commit942ad6d9cda2439622875a7a748649a0e3451d0b (patch)
tree19fec0fb40688334fbc9f29a27f9e6cb1b1c5d78 /source/blender/collada/ArmatureImporter.cpp
parent809e37bf15568080907a008d40aed41c737c2b24 (diff)
style cleanup
Diffstat (limited to 'source/blender/collada/ArmatureImporter.cpp')
-rw-r--r--source/blender/collada/ArmatureImporter.cpp17
1 files changed, 10 insertions, 7 deletions
diff --git a/source/blender/collada/ArmatureImporter.cpp b/source/blender/collada/ArmatureImporter.cpp
index 86d9de64085..6e8bf337abb 100644
--- a/source/blender/collada/ArmatureImporter.cpp
+++ b/source/blender/collada/ArmatureImporter.cpp
@@ -106,13 +106,14 @@ void ArmatureImporter::create_bone(SkinInfo* skin, COLLADAFW::Node *node, EditBo
else {
// bone-space
get_node_mat(obmat, node, NULL, NULL);
-
+
// get world-space
- if (parent){
+ if (parent) {
mult_m4_m4m4(mat, parent_mat, obmat);
}
- else
+ else {
copy_m4_m4(mat, obmat);
+ }
}
if (parent) bone->parent = parent;
@@ -645,7 +646,8 @@ bool ArmatureImporter::write_controller(const COLLADAFW::Controller *controller)
return true;
}
-void ArmatureImporter::make_shape_keys(){
+void ArmatureImporter::make_shape_keys()
+{
std::vector<COLLADAFW::MorphController *>::iterator mc;
float weight;
@@ -668,12 +670,12 @@ void ArmatureImporter::make_shape_keys(){
BKE_key_convert_from_mesh(source_me, kb);
//insert other shape keys
- for ( int i = 0 ; i < morphTargetIds.getCount() ; i++ ){
+ for (int i = 0 ; i < morphTargetIds.getCount() ; i++ ) {
//better to have a seperate map of morph objects,
//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){
+ if (me) {
me->key = key;
kb = BKE_keyblock_add_ctime(key, me->id.name, FALSE);
BKE_key_convert_from_mesh(me, kb);
@@ -682,8 +684,9 @@ void ArmatureImporter::make_shape_keys(){
weight = morphWeights.getFloatValues()->getData()[i];
kb->curval = weight;
}
- else
+ else {
fprintf(stderr, "Morph target geometry not found.\n");
+ }
}
}
}