Commit: 088c0fed3b9579f46f3036c8592b84674ccf86ff
Author: Kévin Dietrich
Date: Thu Jun 9 09:48:10 2016 +0200
Branches: alembic_basic_io
https://developer.blender.org/rB088c0fed3b9579f46f3036c8592b84674ccf86ff
Cleanup: indentation.
===================================================================
M source/blender/alembic/intern/abc_camera.h
M source/blender/alembic/intern/abc_exporter.h
M source/blender/alembic/intern/abc_hair.h
M source/blender/alembic/intern/abc_nurbs.h
M source/blender/alembic/intern/abc_object.h
M source/blender/alembic/intern/abc_points.h
M source/blender/alembic/intern/abc_transform.cc
M source/blender/alembic/intern/abc_transform.h
M source/blender/alembic/intern/abc_util.cc
M source/blender/alembic/intern/abc_util.h
M source/blender/alembic/intern/alembic_capi.cc
M source/blender/blenkernel/intern/idcode.c
M source/blender/makesrna/intern/rna_ID.c
M source/blender/makesrna/intern/rna_modifier.c
M source/blender/makesrna/intern/rna_scene_api.c
M source/blender/modifiers/intern/MOD_meshcache.c
M source/blender/python/intern/bpy_app.c
M source/blender/python/intern/bpy_app_build_options.c
===================================================================
diff --git a/source/blender/alembic/intern/abc_camera.h
b/source/blender/alembic/intern/abc_camera.h
index 398984e..62c21b7 100644
--- a/source/blender/alembic/intern/abc_camera.h
+++ b/source/blender/alembic/intern/abc_camera.h
@@ -28,10 +28,10 @@
class AbcCameraWriter : public AbcObjectWriter {
Alembic::AbcGeom::OCameraSchema m_camera_schema;
- Alembic::AbcGeom::CameraSample m_camera_sample;
- Alembic::AbcGeom::OCompoundProperty m_custom_data_container;
- Alembic::AbcGeom::OFloatProperty m_stereo_distance;
- Alembic::AbcGeom::OFloatProperty m_eye_separation;
+ Alembic::AbcGeom::CameraSample m_camera_sample;
+ Alembic::AbcGeom::OCompoundProperty m_custom_data_container;
+ Alembic::AbcGeom::OFloatProperty m_stereo_distance;
+ Alembic::AbcGeom::OFloatProperty m_eye_separation;
public:
AbcCameraWriter(Scene *scene,
diff --git a/source/blender/alembic/intern/abc_exporter.h
b/source/blender/alembic/intern/abc_exporter.h
index 53078c5..64deca1 100644
--- a/source/blender/alembic/intern/abc_exporter.h
+++ b/source/blender/alembic/intern/abc_exporter.h
@@ -33,8 +33,8 @@ class AbcExporter {
const char *m_filename;
- Alembic::Abc::OArchive m_archive;
- unsigned int m_trans_sampling_index, m_shape_sampling_index;
+ Alembic::Abc::OArchive m_archive;
+ unsigned int m_trans_sampling_index, m_shape_sampling_index;
Scene *m_scene;
double m_saved_frame;
@@ -61,11 +61,11 @@ private:
void createTransformWritersHierarchy();
void createTransformWritersFlat();
- void createTransformWriter(Object *ob, Object *parent, Object
*dupliObParent);
- void exploreTransform(Object *ob, Object *parent, Object *dupliObParent =
NULL);
- void exploreObject(Object *ob, Object *dupliObParent);
+ void createTransformWriter(Object *ob, Object *parent, Object
*dupliObParent);
+ void exploreTransform(Object *ob, Object *parent, Object *dupliObParent
= NULL);
+ void exploreObject(Object *ob, Object *dupliObParent);
void createShapeWriters();
- void createShapeWriter(Object *ob, Object *dupliObParent);
+ void createShapeWriter(Object *ob, Object *dupliObParent);
AbcTransformWriter *getXForm(const std::string &name);
diff --git a/source/blender/alembic/intern/abc_hair.h
b/source/blender/alembic/intern/abc_hair.h
index 9340a89..60d60a08 100644
--- a/source/blender/alembic/intern/abc_hair.h
+++ b/source/blender/alembic/intern/abc_hair.h
@@ -31,7 +31,7 @@ struct ParticleSystem;
/* **************************************************************************
*/
class AbcHairWriter : public AbcObjectWriter {
- ParticleSystem *m_psys;
+ ParticleSystem *m_psys;
Alembic::AbcGeom::OCurvesSchema m_schema;
Alembic::AbcGeom::OCurvesSchema::Sample m_sample;
@@ -39,27 +39,27 @@ class AbcHairWriter : public AbcObjectWriter {
public:
AbcHairWriter(Scene *scene,
Object *ob,
- AbcTransformWriter *parent,
- uint32_t sampling_time,
- ExportSettings &settings,
- ParticleSystem *psys);
+ AbcTransformWriter *parent,
+ uint32_t sampling_time,
+ ExportSettings &settings,
+ ParticleSystem *psys);
private:
virtual void do_write();
void write_hair_sample(DerivedMesh *dm,
- ParticleSettings *part,
- std::vector<Imath::V3f> &verts,
- std::vector<Imath::V3f> &norm_values,
- std::vector<Imath::V2f> &uv_values,
- std::vector<int32_t> &hvertices);
+ ParticleSettings *part,
+ std::vector<Imath::V3f> &verts,
+ std::vector<Imath::V3f> &norm_values,
+ std::vector<Imath::V2f> &uv_values,
+ std::vector<int32_t> &hvertices);
void write_hair_child_sample(DerivedMesh *dm,
ParticleSettings *part,
- std::vector<Imath::V3f> &verts,
- std::vector<Imath::V3f> &norm_values,
- std::vector<Imath::V2f> &uv_values,
- std::vector<int32_t> &hvertices);
+ std::vector<Imath::V3f> &verts,
+ std::vector<Imath::V3f> &norm_values,
+ std::vector<Imath::V2f> &uv_values,
+ std::vector<int32_t> &hvertices);
};
/* **************************************************************************
*/
diff --git a/source/blender/alembic/intern/abc_nurbs.h
b/source/blender/alembic/intern/abc_nurbs.h
index 32d0f58..0b03254 100644
--- a/source/blender/alembic/intern/abc_nurbs.h
+++ b/source/blender/alembic/intern/abc_nurbs.h
@@ -33,14 +33,14 @@ class AbcNurbsWriter : public AbcObjectWriter {
public:
AbcNurbsWriter(Scene *scene,
Object *ob,
- AbcTransformWriter *parent,
- uint32_t sampling_time,
- ExportSettings &settings);
+ AbcTransformWriter *parent,
+ uint32_t sampling_time,
+ ExportSettings &settings);
private:
virtual void do_write();
- bool isAnimated() const;
+ bool isAnimated() const;
};
/* **************************************************************************
*/
diff --git a/source/blender/alembic/intern/abc_object.h
b/source/blender/alembic/intern/abc_object.h
index 1b89739..8eb4a97 100644
--- a/source/blender/alembic/intern/abc_object.h
+++ b/source/blender/alembic/intern/abc_object.h
@@ -40,17 +40,17 @@ struct Main;
class AbcObjectWriter {
protected:
Object *m_object;
- ExportSettings &m_settings;
+ ExportSettings &m_settings;
Scene *m_scene;
uint32_t m_time_sampling;
- Imath::Box3d m_bounds;
- std::vector<AbcObjectWriter *> m_children;
+ Imath::Box3d m_bounds;
+ std::vector<AbcObjectWriter *> m_children;
- std::vector< std::pair<std::string, IDProperty *> > m_props;
+ std::vector< std::pair<std::string, IDProperty *> > m_props;
- bool m_first_frame;
+ bool m_first_frame;
std::string m_name;
public:
@@ -60,16 +60,16 @@ public:
ExportSettings &settings,
AbcObjectWriter *parent = NULL);
- virtual ~AbcObjectWriter();
+ virtual ~AbcObjectWriter();
void addChild(AbcObjectWriter *child);
- virtual Imath::Box3d bounds();
+ virtual Imath::Box3d bounds();
- void write();
+ void write();
private:
- virtual void do_write() = 0;
+ virtual void do_write() = 0;
void getAllProperties(IDProperty *group,
std::vector<std::pair<std::string, IDProperty*> > &allProps, const std::string
&parent);
diff --git a/source/blender/alembic/intern/abc_points.h
b/source/blender/alembic/intern/abc_points.h
index 49e0ae3..b171005 100644
--- a/source/blender/alembic/intern/abc_points.h
+++ b/source/blender/alembic/intern/abc_points.h
@@ -38,10 +38,10 @@ class AbcPointsWriter : public AbcObjectWriter {
public:
AbcPointsWriter(Scene *scene,
Object *ob,
- AbcTransformWriter *parent,
- uint32_t sampling_time,
- ExportSettings &settings,
- ParticleSystem *psys);
+ AbcTransformWriter *parent,
+ uint32_t sampling_time,
+ ExportSettings &settings,
+ ParticleSystem *psys);
void do_write();
};
diff --git a/source/blender/alembic/intern/abc_transform.cc
b/source/blender/alembic/intern/abc_transform.cc
index 6fdccd7..e1c05d4 100644
--- a/source/blender/alembic/intern/abc_transform.cc
+++ b/source/blender/alembic/intern/abc_transform.cc
@@ -53,7 +53,7 @@ AbcTransformWriter::AbcTransformWriter(Object *ob,
sampling_time = 0;
}
- m_xform = OXform(abc_parent, get_id_name(m_object), sampling_time);
+ m_xform = OXform(abc_parent, get_id_name(m_object), sampling_time);
m_schema = m_xform.getSchema();
}
@@ -96,7 +96,7 @@ void AbcTransformWriter::do_write()
mul_v3_fl(mat[3], m_settings.global_scale);
}
- m_matrix = convert_matrix(mat);
+ m_matrix = convert_matrix(mat);
m_sample.setMatrix(m_matrix);
m_schema.set(m_sample);
diff --git a/source/blender/alembic/intern/abc_transform.h
b/source/blender/alembic/intern/abc_transform.h
index 2ee6eb2..a9d3ae7 100644
--- a/source/blender/alembic/intern/abc_transform.h
+++ b/source/blender/alembic/intern/abc_transform.h
@@ -30,8 +30,8 @@
class AbcTransformWriter : public AbcObjectWriter {
Alembic::AbcGeom::OXform m_xform;
- Alembic::AbcGeom::OXformSchema m_schema;
- Alembic::AbcGeom::XformSample m_sample;
+ Alembic::AbcGeom::OXformSchema m_schema;
+ Alembic::AbcGeom::XformSample m_sample;
Alembic::AbcGeom::OVisibilityProperty m_visibility;
Alembic::Abc::M44d m_matrix;
@@ -47,8 +47,8 @@ public:
ExportSettings &settings);
Alembic::AbcGeom::OXform &alembicXform() { return m_xform;}
- virtual Imath::Box3d bounds();
- void setParent(Object *p) { m_parent = p; }
+ virtual Imath::Box3d bounds();
+ void setParent(Object *p) { m_parent = p; }
private:
virtual void do_write();
diff --git a/source/blender/alembic/intern/abc_util.cc
b/source/blender/alembic/intern/abc_util.cc
index 79f8bb5..1071272 100644
--- a/source/blender/alembic/intern/abc_util.cc
+++ b/source/blender/alembic/intern/abc_util.cc
@@ -52,20 +52,20 @@ std::string get_id_name(ID *id)
std::string get_object_dag_path_name(Object *ob, Object *dupli_parent)
{
- std::string name = get_id_name(ob);
+ std::string name = get_id_name(ob);
- Object *p = ob->parent;
+ Object *p = ob->parent;
- while (p) {
- name = get_id_name(p) + "/" + name;
- p = p->parent;
- }
+ while (p) {
+ name = get_id_name(p) + "/" + name;
+ p = p->parent;
+ }
if (dupli_parent && (ob != dupli_parent)) {
name = get_id_name(dupli_parent) + "/" + name;
}
- return name;
+ return name;
}
bool object_selected(Object *ob)
@@ -75,24 +75,24 @@ bool object_selected(Object *ob)
bool parent_selected(Object *ob)
{
- if (object_selected(ob)) {
- return true;
- }
+ if (object_selec
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
