diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-12-29 05:54:58 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-12-29 05:54:58 +0400 |
| commit | 4a427d8e0dad2e252fedf55c5941d5877e139b09 (patch) | |
| tree | 32ca9768952f447e5a1e6c9936490d432dcb59ab /source/blender/collada | |
| parent | 6b211bac153aefce1087e6ac337613de17c4a53f (diff) | |
style cleanup
Diffstat (limited to 'source/blender/collada')
| -rw-r--r-- | source/blender/collada/AnimationImporter.cpp | 4 | ||||
| -rw-r--r-- | source/blender/collada/MeshImporter.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/collada/AnimationImporter.cpp b/source/blender/collada/AnimationImporter.cpp index 44e74e320cc..3d0ceb560ed 100644 --- a/source/blender/collada/AnimationImporter.cpp +++ b/source/blender/collada/AnimationImporter.cpp @@ -1194,7 +1194,7 @@ void AnimationImporter::add_bone_animation_sampled(Object *ob, std::vector<FCurv calc_joint_parent_mat_rest(par, NULL, root, node); mult_m4_m4m4(temp, par, matfra); - // evaluate_joint_world_transform_at_frame(temp, NULL,, node, fra); + // evaluate_joint_world_transform_at_frame(temp, NULL, node, fra); // calc special matrix mul_serie_m4(mat, irest, temp, irest_dae, rest, NULL, NULL, NULL, NULL); @@ -1529,7 +1529,7 @@ Object *AnimationImporter::translate_animation_OLD(COLLADAFW::Node *node, calc_joint_parent_mat_rest(par, NULL, root, node); mult_m4_m4m4(temp, par, matfra); - // evaluate_joint_world_transform_at_frame(temp, NULL,, node, fra); + // evaluate_joint_world_transform_at_frame(temp, NULL, node, fra); // calc special matrix mul_serie_m4(mat, irest, temp, irest_dae, rest, NULL, NULL, NULL, NULL); diff --git a/source/blender/collada/MeshImporter.cpp b/source/blender/collada/MeshImporter.cpp index de8d1e85eb9..8256618bfa3 100644 --- a/source/blender/collada/MeshImporter.cpp +++ b/source/blender/collada/MeshImporter.cpp @@ -1083,8 +1083,8 @@ void MeshImporter::optimize_material_assignments() Object *ob = (*it); Mesh *me = (Mesh *) ob->data; if (me->id.us==1) { - bc_copy_materials_to_data(ob,me); - bc_remove_materials_from_object(ob,me); + bc_copy_materials_to_data(ob, me); + bc_remove_materials_from_object(ob, me); bc_remove_mark(ob); } else if (me->id.us > 1) @@ -1101,10 +1101,10 @@ void MeshImporter::optimize_material_assignments() } } if (can_move) { - bc_copy_materials_to_data(ref_ob,me); + bc_copy_materials_to_data(ref_ob, me); for (int index = 0; index < mesh_users.size(); index++) { Object *object = mesh_users[index]; - bc_remove_materials_from_object(object,me); + bc_remove_materials_from_object(object, me); bc_remove_mark(object); } } |