[Bf-blender-cvs] [8d81a3da37c] master: Cleanup: clang format
Campbell Barton
noreply at git.blender.org
Tue May 28 08:13:58 CEST 2019
Commit: 8d81a3da37c45d2b61f1616522c7540445312604
Author: Campbell Barton
Date: Tue May 28 16:11:49 2019 +1000
Branches: master
https://developer.blender.org/rB8d81a3da37c45d2b61f1616522c7540445312604
Cleanup: clang format
===================================================================
M source/blender/collada/ArmatureExporter.cpp
M source/blender/collada/BCAnimationSampler.cpp
M source/blender/collada/BCSampleData.cpp
M source/blender/collada/BlenderContext.h
M source/blender/collada/TransformWriter.cpp
M source/blender/collada/TransformWriter.h
M source/blender/collada/collada_utils.h
M source/blender/editors/curve/editcurve.c
M source/blender/editors/io/io_collada.c
M source/blender/editors/object/object_transform.c
===================================================================
diff --git a/source/blender/collada/ArmatureExporter.cpp b/source/blender/collada/ArmatureExporter.cpp
index 49d938fc61d..f974996191b 100644
--- a/source/blender/collada/ArmatureExporter.cpp
+++ b/source/blender/collada/ArmatureExporter.cpp
@@ -291,7 +291,7 @@ void ArmatureExporter::add_bone_transform(Object *ob_arm, Bone *bone, COLLADASW:
}
// OPEN_SIM_COMPATIBILITY
-
+
if (export_settings.get_open_sim()) {
// Remove rotations vs armature from transform
// parent_rest_rot * mat * irest_rot
@@ -308,10 +308,8 @@ void ArmatureExporter::add_bone_transform(Object *ob_arm, Bone *bone, COLLADASW:
workmat[3][0] = workmat[3][1] = workmat[3][2] = 0.0f;
mul_m4_m4m4(mat, workmat, mat);
-
}
}
-
}
if (this->export_settings.get_limit_precision()) {
diff --git a/source/blender/collada/BCAnimationSampler.cpp b/source/blender/collada/BCAnimationSampler.cpp
index 7b0c6c41a01..1e6ff79f132 100644
--- a/source/blender/collada/BCAnimationSampler.cpp
+++ b/source/blender/collada/BCAnimationSampler.cpp
@@ -157,7 +157,7 @@ void BCAnimationSampler::update_animation_curves(BCAnimation &animation,
BCSample &BCAnimationSampler::sample_object(Object *ob, int frame_index, bool for_opensim)
{
BCSample &ob_sample = sample_data.add(ob, frame_index);
- //if (export_settings.get_apply_global_orientation()) {
+ // if (export_settings.get_apply_global_orientation()) {
// const BCMatrix &global_transform = export_settings.get_global_transform();
// ob_sample.get_matrix(global_transform);
//}
diff --git a/source/blender/collada/BCSampleData.cpp b/source/blender/collada/BCSampleData.cpp
index cf3668a08af..88a7fd5993c 100644
--- a/source/blender/collada/BCSampleData.cpp
+++ b/source/blender/collada/BCSampleData.cpp
@@ -66,7 +66,7 @@ BCMatrix::BCMatrix(BC_global_forward_axis global_forward_axis, BC_global_up_axis
mat3_from_axis_conversion(
BC_DEFAULT_FORWARD, BC_DEFAULT_UP, global_forward_axis, global_up_axis, mrot);
- transpose_m3(mrot); // TODO: Verify that mat3_from_axis_conversion() returns a transposed matrix
+ transpose_m3(mrot); // TODO: Verify that mat3_from_axis_conversion() returns a transposed matrix
copy_m4_m3(mat, mrot);
set_transform(mat);
}
@@ -98,7 +98,10 @@ void BCMatrix::add_transform(Matrix &to, const Matrix &transform, const Matrix &
}
}
-void BCMatrix::apply_transform(Matrix &to, const Matrix &transform, const Matrix &from, bool inverse)
+void BCMatrix::apply_transform(Matrix &to,
+ const Matrix &transform,
+ const Matrix &from,
+ bool inverse)
{
Matrix globinv;
invert_m4_m4(globinv, transform);
diff --git a/source/blender/collada/BlenderContext.h b/source/blender/collada/BlenderContext.h
index da0384eba8b..c23a1b0f312 100644
--- a/source/blender/collada/BlenderContext.h
+++ b/source/blender/collada/BlenderContext.h
@@ -107,9 +107,9 @@ class BCMatrix {
const Matrix &from,
const bool inverted = false);
void apply_transform(Matrix &to,
- const Matrix &transform,
- const Matrix &from,
- const bool inverted = false);
+ const Matrix &transform,
+ const Matrix &from,
+ const bool inverted = false);
void add_inverted_transform(Matrix &to, const Matrix &transform, const Matrix &from);
void add_transform(const Matrix &matrix, const bool inverted = false);
void add_transform(const BCMatrix &matrix, const bool inverted = false);
diff --git a/source/blender/collada/TransformWriter.cpp b/source/blender/collada/TransformWriter.cpp
index a80d02ab9a3..560ce8a359f 100644
--- a/source/blender/collada/TransformWriter.cpp
+++ b/source/blender/collada/TransformWriter.cpp
@@ -26,11 +26,10 @@
#include "TransformWriter.h"
void TransformWriter::add_joint_transform(COLLADASW::Node &node,
- float mat[4][4],
- float parent_mat[4][4],
- BCExportSettings &export_settings,
- bool has_restmat
- )
+ float mat[4][4],
+ float parent_mat[4][4],
+ BCExportSettings &export_settings,
+ bool has_restmat)
{
float local[4][4];
@@ -106,9 +105,8 @@ void TransformWriter::add_node_transform_ob(COLLADASW::Node &node,
}
}
-void TransformWriter::add_node_transform_identity(
- COLLADASW::Node &node,
- BCExportSettings &export_settings)
+void TransformWriter::add_node_transform_identity(COLLADASW::Node &node,
+ BCExportSettings &export_settings)
{
BC_export_transformation_type transformation_type =
export_settings.get_object_transformation_type();
diff --git a/source/blender/collada/TransformWriter.h b/source/blender/collada/TransformWriter.h
index f0bfbaabbc2..d2e4b369cdc 100644
--- a/source/blender/collada/TransformWriter.h
+++ b/source/blender/collada/TransformWriter.h
@@ -32,10 +32,10 @@
class TransformWriter {
protected:
void add_joint_transform(COLLADASW::Node &node,
- float mat[4][4],
- float parent_mat[4][4],
- BCExportSettings &export_settings,
- bool has_restmat);
+ float mat[4][4],
+ float parent_mat[4][4],
+ BCExportSettings &export_settings,
+ bool has_restmat);
void add_node_transform_ob(COLLADASW::Node &node, Object *ob, BCExportSettings &export_settings);
diff --git a/source/blender/collada/collada_utils.h b/source/blender/collada/collada_utils.h
index 810b9056193..ca40de6fc1d 100644
--- a/source/blender/collada/collada_utils.h
+++ b/source/blender/collada/collada_utils.h
@@ -251,10 +251,10 @@ extern void bc_apply_global_transform(Vector &to_vec,
const BCMatrix &global_transform,
const bool invert = false);
extern void bc_create_restpose_mat(BCExportSettings &export_settings,
- Bone *bone,
- float to_mat[4][4],
- float from_mat[4][4],
- bool use_local_space);
+ Bone *bone,
+ float to_mat[4][4],
+ float from_mat[4][4],
+ bool use_local_space);
class ColladaBaseNodes {
private:
diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c
index 5dbc2dd74eb..8d131ee28ba 100644
--- a/source/blender/editors/curve/editcurve.c
+++ b/source/blender/editors/curve/editcurve.c
@@ -3307,7 +3307,8 @@ static int reveal_exec(bContext *C, wmOperator *op)
}
if (changed) {
- DEG_id_tag_update(obedit->data, ID_RECALC_COPY_ON_WRITE | ID_RECALC_SELECT | ID_RECALC_GEOMETRY);
+ DEG_id_tag_update(obedit->data,
+ ID_RECALC_COPY_ON_WRITE | ID_RECALC_SELECT | ID_RECALC_GEOMETRY);
WM_event_add_notifier(C, NC_GEOM | ND_SELECT, obedit->data);
changed_multi = true;
}
diff --git a/source/blender/editors/io/io_collada.c b/source/blender/editors/io/io_collada.c
index c5c24051299..1f844961d19 100644
--- a/source/blender/editors/io/io_collada.c
+++ b/source/blender/editors/io/io_collada.c
@@ -172,10 +172,10 @@ static int wm_collada_export_exec(bContext *C, wmOperator *op)
use_blender_profile = RNA_boolean_get(op->ptr, "use_blender_profile");
sort_by_name = RNA_boolean_get(op->ptr, "sort_by_name");
- export_object_transformation_type = RNA_enum_get(
- op->ptr, "export_object_transformation_type_selection");
+ export_object_transformation_type = RNA_enum_get(op->ptr,
+ "export_object_transformation_type_selection");
export_animation_transformation_type = RNA_enum_get(
- op->ptr, "export_animation_transformation_type_selection");
+ op->ptr, "export_animation_transformation_type_selection");
open_sim = RNA_boolean_get(op->ptr, "open_sim");
limit_precision = RNA_boolean_get(op->ptr, "limit_precision");
@@ -271,11 +271,11 @@ static void uiCollada_exportSettings(uiLayout *layout, PointerRNA *imfptr)
bool include_animations = RNA_boolean_get(imfptr, "include_animations");
int ui_section = RNA_enum_get(imfptr, "prop_bc_export_ui_section");
- BC_export_animation_type animation_type = RNA_enum_get(
- imfptr, "export_animation_type_selection");
+ BC_export_animation_type animation_type = RNA_enum_get(imfptr,
+ "export_animation_type_selection");
BC_export_transformation_type animation_transformation_type = RNA_enum_get(
- imfptr, "export_animation_transformation_type_selection");
+ imfptr, "export_animation_transformation_type_selection");
bool sampling = animation_type == BC_ANIMATION_EXPORT_SAMPLES;
@@ -727,7 +727,7 @@ void WM_OT_collada_export(wmOperatorType *ot)
INT_MAX,
"Transform",
"Transformation type for translation, scale and rotation\n"
- "Note: The Animation transformation type in the Anim Tab\n"\
+ "Note: The Animation transformation type in the Anim Tab\n"
"is always equal to the Object transformation type in the Geom tab",
INT_MIN,
INT_MAX);
diff --git a/source/blender/editors/object/object_transform.c b/source/blender/editors/object/object_transform.c
index 61cdf689044..00f5dffb3cc 100644
--- a/source/blender/editors/object/object_transform.c
+++ b/source/blender/editors/object/object_transform.c
@@ -1336,8 +1336,7 @@ static int object_origin_set_exec(bContext *C, wmOperator *
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list