Commit: 30dc14875fc11080eaded7719d3f8ca3daf8dfa3
Author: Gaia Clary
Date: Fri Aug 3 18:27:55 2018 +0200
Branches: collada
https://developer.blender.org/rB30dc14875fc11080eaded7719d3f8ca3daf8dfa3
cleanup: fixed indentation and white space issues
===================================================================
M source/blender/collada/AnimationExporter.h
M source/blender/collada/AnimationImporter.cpp
M source/blender/collada/BCAnimationSampler.h
M source/blender/collada/EffectExporter.cpp
M source/blender/collada/MeshImporter.cpp
M source/blender/collada/SceneExporter.cpp
M source/blender/collada/collada_utils.cpp
M source/blender/collada/collada_utils.h
===================================================================
diff --git a/source/blender/collada/AnimationExporter.h
b/source/blender/collada/AnimationExporter.h
index de74b40065a..f9dafec8786 100644
--- a/source/blender/collada/AnimationExporter.h
+++ b/source/blender/collada/AnimationExporter.h
@@ -179,7 +179,6 @@ private:
/* source ID = animation_name + semantic_suffix */
std::string get_semantic_suffix(COLLADASW::InputSemantic::Semantics
semantic);
-
void add_source_parameters(COLLADASW::SourceBase::ParameterNameList&
param,
COLLADASW::InputSemantic::Semantics semantic,
bool is_rot,
diff --git a/source/blender/collada/AnimationImporter.cpp
b/source/blender/collada/AnimationImporter.cpp
index 2030af76bb6..cfb62a18412 100644
--- a/source/blender/collada/AnimationImporter.cpp
+++ b/source/blender/collada/AnimationImporter.cpp
@@ -943,6 +943,7 @@ void
AnimationImporter::translate_Animations(COLLADAFW::Node *node,
if (!ob->adt || !ob->adt->action)
act = verify_adt_action(bmain, (ID *)&ob->id, 1);
+
else
act = ob->adt->action;
diff --git a/source/blender/collada/BCAnimationSampler.h
b/source/blender/collada/BCAnimationSampler.h
index 85ce103109d..15ad8deab2e 100644
--- a/source/blender/collada/BCAnimationSampler.h
+++ b/source/blender/collada/BCAnimationSampler.h
@@ -43,6 +43,7 @@ private:
Object *reference = NULL;
bContext *mContext;
+
public:
BCFrameSet frame_set;
BCAnimationCurveMap curve_map;
diff --git a/source/blender/collada/EffectExporter.cpp
b/source/blender/collada/EffectExporter.cpp
index 178fe587945..961e223eef1 100644
--- a/source/blender/collada/EffectExporter.cpp
+++ b/source/blender/collada/EffectExporter.cpp
@@ -48,8 +48,10 @@ extern "C" {
#include "BKE_material.h"
}
-EffectsExporter::EffectsExporter(COLLADASW::StreamWriter *sw, const
ExportSettings *export_settings) : COLLADASW::LibraryEffects(sw),
export_settings(export_settings) {
-}
+EffectsExporter::EffectsExporter(COLLADASW::StreamWriter *sw, const
ExportSettings *export_settings) :
+ COLLADASW::LibraryEffects(sw),
+ export_settings(export_settings)
+{}
bool EffectsExporter::hasEffects(Scene *sce)
diff --git a/source/blender/collada/MeshImporter.cpp
b/source/blender/collada/MeshImporter.cpp
index 4332f45c9bc..93ab0749436 100644
--- a/source/blender/collada/MeshImporter.cpp
+++ b/source/blender/collada/MeshImporter.cpp
@@ -602,7 +602,6 @@ void MeshImporter::read_lines(COLLADAFW::Mesh *mesh, Mesh
*me)
COLLADAFW::MeshPrimitiveArray& prim_arr =
mesh->getMeshPrimitives();
for (int index = 0; index < prim_arr.getCount(); index++) {
-
COLLADAFW::MeshPrimitive *mp = prim_arr[index];
int type = mp->getPrimitiveType();
diff --git a/source/blender/collada/SceneExporter.cpp
b/source/blender/collada/SceneExporter.cpp
index ece26de23a7..a3e8f7a7616 100644
--- a/source/blender/collada/SceneExporter.cpp
+++ b/source/blender/collada/SceneExporter.cpp
@@ -225,6 +225,7 @@ void SceneExporter::writeNodes(Object *ob, Scene *sce)
cti->flush_constraint_targets(con, &targets, 1);
}
+
con = con->next;
}
}
diff --git a/source/blender/collada/collada_utils.cpp
b/source/blender/collada/collada_utils.cpp
index 4e6b48a8435..81a5a1de354 100644
--- a/source/blender/collada/collada_utils.cpp
+++ b/source/blender/collada/collada_utils.cpp
@@ -310,6 +310,7 @@ Object *bc_get_assigned_armature(Object *ob)
* ob->id.tag & LIB_TAG_DOIT
*/
Object *bc_get_highest_selected_ancestor_or_self(LinkNode *export_set, Object
*ob)
+
{
Object *ancestor = ob;
while (ob->parent && bc_is_marked(ob->parent)) {
diff --git a/source/blender/collada/collada_utils.h
b/source/blender/collada/collada_utils.h
index 0075f66bf5f..8a59a85e55d 100644
--- a/source/blender/collada/collada_utils.h
+++ b/source/blender/collada/collada_utils.h
@@ -77,6 +77,8 @@ extern void bc_update_scene(const bContext *C, Scene *scene,
float ctime);
std::vector<bAction *> bc_getSceneActions(const bContext *C, Object *ob, bool
all_actions);
+/* Action helpers */
+
inline bAction *bc_getSceneObjectAction(Object *ob)
{
return (ob->adt && ob->adt->action) ? ob->adt->action : NULL;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
