[Bf-blender-cvs] [a0cd09d] alembic_basic_io: Cleanup: indent.
Kévin Dietrich
noreply at git.blender.org
Fri Jul 8 11:44:50 CEST 2016
Commit: a0cd09d1c01c82b497e25c7b3be2b4ecf793199e
Author: Kévin Dietrich
Date: Fri Jul 8 11:10:31 2016 +0200
Branches: alembic_basic_io
https://developer.blender.org/rBa0cd09d1c01c82b497e25c7b3be2b4ecf793199e
Cleanup: indent.
===================================================================
M source/blender/alembic/intern/abc_curves.cc
M source/blender/modifiers/intern/MOD_meshsequencecache.c
===================================================================
diff --git a/source/blender/alembic/intern/abc_curves.cc b/source/blender/alembic/intern/abc_curves.cc
index 6c08435..960712f 100644
--- a/source/blender/alembic/intern/abc_curves.cc
+++ b/source/blender/alembic/intern/abc_curves.cc
@@ -150,12 +150,12 @@ void AbcCurveWriter::do_write()
if ((nurbs->flagu & CU_NURB_CYCLIC) != 0) {
knots[0] = nurbs->knotsu[0];
- knots[num_knots - 1] = nurbs->knotsu[num_knots - 1];
- }
- else {
+ knots[num_knots - 1] = nurbs->knotsu[num_knots - 1];
+ }
+ else {
knots[0] = (2.0f * nurbs->knotsu[0] - nurbs->knotsu[1]);
- knots[num_knots - 1] = (2.0f * nurbs->knotsu[num_knots - 1] - nurbs->knotsu[num_knots - 2]);
- }
+ knots[num_knots - 1] = (2.0f * nurbs->knotsu[num_knots - 1] - nurbs->knotsu[num_knots - 2]);
+ }
orders.push_back(nurbs->orderu + 1);
vert_counts.push_back(verts.size());
@@ -250,11 +250,11 @@ void read_curve_sample(Curve *cu, const ICurvesSchema &schema, const float time)
nu->orderu = num_verts;
if (smp.getType() == Alembic::AbcGeom::kCubic) {
- nu->orderu = 3;
- }
- else if (orders && orders->size() > i) {
- nu->orderu = static_cast<short>((*orders)[i] - 1);
- }
+ nu->orderu = 3;
+ }
+ else if (orders && orders->size() > i) {
+ nu->orderu = static_cast<short>((*orders)[i] - 1);
+ }
if (periodicity == Alembic::AbcGeom::kNonPeriodic) {
nu->flagu |= CU_NURB_ENDPOINT;
diff --git a/source/blender/modifiers/intern/MOD_meshsequencecache.c b/source/blender/modifiers/intern/MOD_meshsequencecache.c
index c6a26e8..d44ccff 100644
--- a/source/blender/modifiers/intern/MOD_meshsequencecache.c
+++ b/source/blender/modifiers/intern/MOD_meshsequencecache.c
@@ -136,7 +136,6 @@ static void updateDepsgraph(ModifierData *md,
UNUSED_VARS(bmain, scene, ob);
}
-
ModifierTypeInfo modifierType_MeshSequenceCache = {
/* name */ "Mesh Sequence Cache",
/* structName */ "MeshSeqCacheModifierData",
More information about the Bf-blender-cvs
mailing list