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>2012-08-26 15:35:43 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-08-26 15:35:43 +0400
commitee96cde864ff8451713e9e9674890bbd69fc42a4 (patch)
tree6aa35b266cfc3d6e5994b309d90bfb45796ac02a /source/blender/collada
parent3bfe4520ae027a5d431b7f7714a02adb416492c2 (diff)
style cleanup: whitespace
Diffstat (limited to 'source/blender/collada')
-rw-r--r--source/blender/collada/AnimationExporter.h4
-rw-r--r--source/blender/collada/AnimationImporter.cpp2
-rw-r--r--source/blender/collada/TransformReader.h2
-rw-r--r--source/blender/collada/collada_internal.h2
4 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/collada/AnimationExporter.h b/source/blender/collada/AnimationExporter.h
index 0a7832e9d64..7fd39765cc9 100644
--- a/source/blender/collada/AnimationExporter.h
+++ b/source/blender/collada/AnimationExporter.h
@@ -96,7 +96,7 @@ public:
protected:
const ExportSettings *export_settings;
- void dae_animation(Object* ob, FCurve *fcu, char* transformName, bool is_param, Material *ma = NULL);
+ void dae_animation(Object *ob, FCurve *fcu, char *transformName, bool is_param, Material *ma = NULL);
void write_bone_animation_matrix(Object *ob_arm, Bone *bone);
@@ -161,7 +161,7 @@ protected:
bool hasAnimations(Scene *sce);
- char* extract_transform_name(char *rna_path);
+ char *extract_transform_name(char *rna_path);
std::string getObjectBoneName(Object *ob, const FCurve * fcu);
};
diff --git a/source/blender/collada/AnimationImporter.cpp b/source/blender/collada/AnimationImporter.cpp
index a237222774d..d241926c20c 100644
--- a/source/blender/collada/AnimationImporter.cpp
+++ b/source/blender/collada/AnimationImporter.cpp
@@ -561,7 +561,7 @@ void AnimationImporter:: Assign_transform_animations(COLLADAFW::Transformation *
case COLLADAFW::Transformation::MATRIX:
/*{
- COLLADAFW::Matrix* mat = (COLLADAFW::Matrix*)transform;
+ COLLADAFW::Matrix *mat = (COLLADAFW::Matrix*)transform;
COLLADABU::Math::Matrix4 mat4 = mat->getMatrix();
switch (binding->animationClass) {
case COLLADAFW::AnimationList::TRANSFORM:
diff --git a/source/blender/collada/TransformReader.h b/source/blender/collada/TransformReader.h
index a08f4438d73..47e59a1bf52 100644
--- a/source/blender/collada/TransformReader.h
+++ b/source/blender/collada/TransformReader.h
@@ -56,7 +56,7 @@ public:
COLLADAFW::Transformation *tm; // which transform is animated by an AnimationList->id
};
- TransformReader(UnitConverter* conv);
+ TransformReader(UnitConverter *conv);
void get_node_mat(float mat[][4], COLLADAFW::Node *node, std::map<COLLADAFW::UniqueId, Animation> *animation_map, Object *ob);
diff --git a/source/blender/collada/collada_internal.h b/source/blender/collada/collada_internal.h
index b64c75e7960..c1f75f996ce 100644
--- a/source/blender/collada/collada_internal.h
+++ b/source/blender/collada/collada_internal.h
@@ -59,7 +59,7 @@ public:
// Initialize with Z_UP, since Blender uses right-handed, z-up
UnitConverter();
- void read_asset(const COLLADAFW::FileInfo* asset);
+ void read_asset(const COLLADAFW::FileInfo *asset);
void convertVector3(COLLADABU::Math::Vector3 &vec, float *v);