[Bf-blender-cvs] [8405f95] alembic_basic_io: Cleanup: indent.
Kévin Dietrich
noreply at git.blender.org
Mon Jul 4 07:14:35 CEST 2016
Commit: 8405f9534af0d5f11e4499f34f8650e6050129c1
Author: Kévin Dietrich
Date: Mon Jul 4 07:14:14 2016 +0200
Branches: alembic_basic_io
https://developer.blender.org/rB8405f9534af0d5f11e4499f34f8650e6050129c1
Cleanup: indent.
===================================================================
M source/blender/alembic/intern/abc_exporter.cc
M source/blender/alembic/intern/abc_mesh.cc
M source/blender/alembic/intern/abc_mesh.h
===================================================================
diff --git a/source/blender/alembic/intern/abc_exporter.cc b/source/blender/alembic/intern/abc_exporter.cc
index 1c49062..d748c33 100644
--- a/source/blender/alembic/intern/abc_exporter.cc
+++ b/source/blender/alembic/intern/abc_exporter.cc
@@ -71,27 +71,27 @@ using Alembic::Abc::OBox3dProperty;
ExportSettings::ExportSettings()
: scene(NULL)
, selected_only(false)
- , visible_layers_only(false)
- , renderable_only(false)
- , startframe(1)
+ , visible_layers_only(false)
+ , renderable_only(false)
+ , startframe(1)
, endframe(1)
- , xform_frame_step(1)
- , shape_frame_step(1)
- , shutter_open(0.0)
- , shutter_close(1.0)
- , global_scale(1.0f)
- , flatten_hierarchy(false)
- , export_normals(false)
- , export_uvs(false)
- , export_vcols(false)
- , export_face_sets(false)
- , export_vweigths(false)
- , apply_subdiv(false)
- , use_subdiv_schema(false)
- , export_child_hairs(true)
- , export_ogawa(true)
- , pack_uv(false)
- , do_convert_axis(false)
+ , xform_frame_step(1)
+ , shape_frame_step(1)
+ , shutter_open(0.0)
+ , shutter_close(1.0)
+ , global_scale(1.0f)
+ , flatten_hierarchy(false)
+ , export_normals(false)
+ , export_uvs(false)
+ , export_vcols(false)
+ , export_face_sets(false)
+ , export_vweigths(false)
+ , apply_subdiv(false)
+ , use_subdiv_schema(false)
+ , export_child_hairs(true)
+ , export_ogawa(true)
+ , pack_uv(false)
+ , do_convert_axis(false)
{}
static bool object_is_smoke_sim(Object *ob)
diff --git a/source/blender/alembic/intern/abc_mesh.cc b/source/blender/alembic/intern/abc_mesh.cc
index 65b2eec..3d97fa4 100644
--- a/source/blender/alembic/intern/abc_mesh.cc
+++ b/source/blender/alembic/intern/abc_mesh.cc
@@ -805,12 +805,12 @@ static bool has_animations(Schema &schema, ImportSettings *settings)
/* Check for animated UVs. */
if (IV2fGeomParam::matches(propHeader) && Alembic::AbcGeom::isUV(propHeader)) {
- IV2fGeomParam uv_geom_param(arb_geom_params, propHeader.getName());
+ IV2fGeomParam uv_geom_param(arb_geom_params, propHeader.getName());
if (!uv_geom_param.isConstant()) {
return true;
}
- }
+ }
}
return false;
diff --git a/source/blender/alembic/intern/abc_mesh.h b/source/blender/alembic/intern/abc_mesh.h
index d03eecd..d550f5d 100644
--- a/source/blender/alembic/intern/abc_mesh.h
+++ b/source/blender/alembic/intern/abc_mesh.h
@@ -53,16 +53,16 @@ class AbcMeshWriter : public AbcObjectWriter {
public:
AbcMeshWriter(Scene *scene,
Object *ob,
- AbcTransformWriter *parent,
- uint32_t time_sampling,
- ExportSettings &settings);
+ AbcTransformWriter *parent,
+ uint32_t time_sampling,
+ ExportSettings &settings);
~AbcMeshWriter();
private:
virtual void do_write();
- bool isAnimated() const;
+ bool isAnimated() const;
void writeMesh(DerivedMesh *dm);
void writeSubD(DerivedMesh *dm);
@@ -77,7 +77,7 @@ private:
DerivedMesh *getFinalMesh();
void freeMesh(DerivedMesh *dm);
- void getMaterialIndices(DerivedMesh *dm, std::vector<int32_t> &indices);
+ void getMaterialIndices(DerivedMesh *dm, std::vector<int32_t> &indices);
void writeArbGeoParams(DerivedMesh *dm);
void getGeoGroups(DerivedMesh *dm, std::map<std::string, std::vector<int32_t> > &geoGroups);
@@ -108,7 +108,7 @@ private:
void readPolyDataSample(Mesh *mesh,
const Alembic::AbcGeom::Int32ArraySamplePtr &face_indices,
- const Alembic::AbcGeom::Int32ArraySamplePtr &face_counts,
+ const Alembic::AbcGeom::Int32ArraySamplePtr &face_counts,
const Alembic::AbcGeom::N3fArraySamplePtr &normals);
void readVertexDataSample(Mesh *mesh,
More information about the Bf-blender-cvs
mailing list