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-04 04:18:09 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-02-04 04:18:09 +0400
commit69993c5d4089bb58758f9a190237dc4651d72d44 (patch)
tree771f57dd80767c2a444ee03dfa98b3151626e47a /source/blender/collada/AnimationExporter.cpp
parent9d4be17de42deb3109febc8433bf2acea2196218 (diff)
style cleanup: spaces -> tabs
Diffstat (limited to 'source/blender/collada/AnimationExporter.cpp')
-rw-r--r--source/blender/collada/AnimationExporter.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/source/blender/collada/AnimationExporter.cpp b/source/blender/collada/AnimationExporter.cpp
index e751f987524..4a0696dc857 100644
--- a/source/blender/collada/AnimationExporter.cpp
+++ b/source/blender/collada/AnimationExporter.cpp
@@ -84,9 +84,9 @@ void AnimationExporter::operator()(Object *ob)
}
}
-
- export_object_constraint_animation(ob);
-
+
+ export_object_constraint_animation(ob);
+
//This needs to be handled by extra profiles, so postponed for now
//export_morph_animation(ob);
@@ -149,11 +149,11 @@ void AnimationExporter::operator()(Object *ob)
void AnimationExporter::export_object_constraint_animation(Object *ob)
{
std::vector<float> fra;
- //Takes frames of target animations
+ //Takes frames of target animations
make_anim_frames_from_targets(ob, fra);
-
+
if (fra.size())
- dae_baked_object_animation(fra, ob);
+ dae_baked_object_animation(fra, ob);
}
void AnimationExporter::export_morph_animation(Object *ob)
@@ -274,8 +274,8 @@ void AnimationExporter::dae_animation(Object *ob, FCurve *fcu, char *transformNa
//axis names for colors
else if (!strcmp(transformName, "color") ||
- !strcmp(transformName, "specular_color") ||
- !strcmp(transformName, "diffuse_color") ||
+ !strcmp(transformName, "specular_color") ||
+ !strcmp(transformName, "diffuse_color") ||
!strcmp(transformName, "alpha"))
{
const char *axis_names[] = {"R", "G", "B"};
@@ -285,9 +285,9 @@ void AnimationExporter::dae_animation(Object *ob, FCurve *fcu, char *transformNa
//axis names for transforms
else if (!strcmp(transformName, "location") ||
- !strcmp(transformName, "scale") ||
+ !strcmp(transformName, "scale") ||
!strcmp(transformName, "rotation_euler") ||
- !strcmp(transformName, "rotation_quaternion"))
+ !strcmp(transformName, "rotation_quaternion"))
{
const char *axis_names[] = {"X", "Y", "Z"};
if (fcu->array_index < 3)
@@ -526,7 +526,7 @@ void AnimationExporter::dae_baked_object_animation(std::vector<float> &fra, Obje
return;
BLI_snprintf(anim_id, sizeof(anim_id), "%s_%s", (char*)translate_id(ob_name).c_str(),
- "object_matrix");
+ "object_matrix");
openAnimation(anim_id, COLLADABU::Utils::EMPTY_STRING);
@@ -897,7 +897,7 @@ std::string AnimationExporter::create_4x4_source(std::vector<float> &frames, Obj
add_source_parameters(param, semantic, false, NULL, true);
source.prepareToAppendValues();
-
+
bPoseChannel *parchan = NULL;
bPoseChannel *pchan = NULL;
@@ -916,7 +916,7 @@ std::string AnimationExporter::create_4x4_source(std::vector<float> &frames, Obj
int j = 0;
for (it = frames.begin(); it != frames.end(); it++) {
float mat[4][4], ipar[4][4];
-
+
float ctime = BKE_scene_frame_get_from_ctime(scene, *it);
CFRA = BKE_scene_frame_get_from_ctime(scene, *it);
//BKE_scene_update_for_newframe(G.main,scene,scene->lay);