Commit: 569150b0d3829cc8ce27bf932a24492899173293
Author: Kévin Dietrich
Date: Thu Jun 9 09:49:28 2016 +0200
Branches: alembic_basic_io
https://developer.blender.org/rB569150b0d3829cc8ce27bf932a24492899173293
Cleanup: API consistency.
===================================================================
M source/blender/alembic/intern/abc_camera.cc
M source/blender/alembic/intern/abc_camera.h
M source/blender/alembic/intern/abc_hair.cc
M source/blender/alembic/intern/abc_hair.h
M source/blender/alembic/intern/abc_mesh.cc
M source/blender/alembic/intern/abc_mesh.h
M source/blender/alembic/intern/abc_nurbs.cc
M source/blender/alembic/intern/abc_nurbs.h
M source/blender/alembic/intern/abc_object.cc
M source/blender/alembic/intern/abc_object.h
M source/blender/alembic/intern/abc_points.cc
M source/blender/alembic/intern/abc_points.h
M source/blender/alembic/intern/abc_transform.cc
M source/blender/alembic/intern/abc_transform.h
===================================================================
diff --git a/source/blender/alembic/intern/abc_camera.cc
b/source/blender/alembic/intern/abc_camera.cc
index 2b627b2..1fe9926 100644
--- a/source/blender/alembic/intern/abc_camera.cc
+++ b/source/blender/alembic/intern/abc_camera.cc
@@ -52,9 +52,9 @@ using Alembic::AbcGeom::kWrapExisting;
AbcCameraWriter::AbcCameraWriter(Scene *scene,
Object *ob,
AbcTransformWriter *parent,
- uint32_t sampling_time,
+ uint32_t time_sampling,
ExportSettings &settings)
- : AbcObjectWriter(scene, ob, sampling_time, settings, parent)
+ : AbcObjectWriter(scene, ob, time_sampling, settings, parent)
{
OCamera camera(parent->alembicXform(), m_name, m_time_sampling);
m_camera_schema = camera.getSchema();
diff --git a/source/blender/alembic/intern/abc_camera.h
b/source/blender/alembic/intern/abc_camera.h
index 62c21b7..046420f 100644
--- a/source/blender/alembic/intern/abc_camera.h
+++ b/source/blender/alembic/intern/abc_camera.h
@@ -37,7 +37,7 @@ public:
AbcCameraWriter(Scene *scene,
Object *ob,
AbcTransformWriter *parent,
- uint32_t sampling_time,
+ uint32_t time_sampling,
ExportSettings &settings);
private:
diff --git a/source/blender/alembic/intern/abc_hair.cc
b/source/blender/alembic/intern/abc_hair.cc
index 9ea344e..90f2061 100644
--- a/source/blender/alembic/intern/abc_hair.cc
+++ b/source/blender/alembic/intern/abc_hair.cc
@@ -65,10 +65,10 @@ static const float nscale = 1.0f / 32767.0f;
AbcHairWriter::AbcHairWriter(Scene *scene,
Object *ob,
AbcTransformWriter *parent,
- uint32_t sampling_time,
+ uint32_t time_sampling,
ExportSettings &settings,
ParticleSystem *psys)
- : AbcObjectWriter(scene, ob, sampling_time, settings, parent)
+ : AbcObjectWriter(scene, ob, time_sampling, settings, parent)
{
m_psys = psys;
diff --git a/source/blender/alembic/intern/abc_hair.h
b/source/blender/alembic/intern/abc_hair.h
index 60d60a08..f613d03 100644
--- a/source/blender/alembic/intern/abc_hair.h
+++ b/source/blender/alembic/intern/abc_hair.h
@@ -40,7 +40,7 @@ public:
AbcHairWriter(Scene *scene,
Object *ob,
AbcTransformWriter *parent,
- uint32_t sampling_time,
+ uint32_t time_sampling,
ExportSettings &settings,
ParticleSystem *psys);
diff --git a/source/blender/alembic/intern/abc_mesh.cc
b/source/blender/alembic/intern/abc_mesh.cc
index bff4345..3f20d91 100644
--- a/source/blender/alembic/intern/abc_mesh.cc
+++ b/source/blender/alembic/intern/abc_mesh.cc
@@ -364,9 +364,9 @@ static ModifierData *get_fluid_sim_modifier(Scene *scene,
Object *ob)
AbcMeshWriter::AbcMeshWriter(Scene *scene,
Object *ob,
AbcTransformWriter *parent,
- uint32_t sampling_time,
+ uint32_t time_sampling,
ExportSettings &settings)
- : AbcObjectWriter(scene, ob, sampling_time, settings, parent)
+ : AbcObjectWriter(scene, ob, time_sampling, settings, parent)
{
m_is_animated = isAnimated();
m_subsurf_mod = NULL;
@@ -376,7 +376,7 @@ AbcMeshWriter::AbcMeshWriter(Scene *scene,
/* if the object is static, use the default static time sampling */
if (!m_is_animated) {
- sampling_time = 0;
+ time_sampling = 0;
}
if (!m_settings.export_subsurfs_as_meshes) {
diff --git a/source/blender/alembic/intern/abc_mesh.h
b/source/blender/alembic/intern/abc_mesh.h
index d4eff13..aae43eb 100644
--- a/source/blender/alembic/intern/abc_mesh.h
+++ b/source/blender/alembic/intern/abc_mesh.h
@@ -59,7 +59,7 @@ public:
AbcMeshWriter(Scene *scene,
Object *ob,
AbcTransformWriter *parent,
- uint32_t sampling_time,
+ uint32_t time_sampling,
ExportSettings &settings);
~AbcMeshWriter();
diff --git a/source/blender/alembic/intern/abc_nurbs.cc
b/source/blender/alembic/intern/abc_nurbs.cc
index c55e5aa..f91f00c 100644
--- a/source/blender/alembic/intern/abc_nurbs.cc
+++ b/source/blender/alembic/intern/abc_nurbs.cc
@@ -63,15 +63,15 @@ using Alembic::AbcGeom::ONuPatchSchema;
AbcNurbsWriter::AbcNurbsWriter(Scene *scene,
Object *ob,
AbcTransformWriter *parent,
- uint32_t sampling_time,
+ uint32_t time_sampling,
ExportSettings &settings)
- : AbcObjectWriter(scene, ob, sampling_time, settings, parent)
+ : AbcObjectWriter(scene, ob, time_sampling, settings, parent)
{
m_is_animated = isAnimated();
/* if the object is static, use the default static time sampling */
if (!m_is_animated) {
- sampling_time = 0;
+ time_sampling = 0;
}
Curve *curve = static_cast<Curve *>(m_object->data);
diff --git a/source/blender/alembic/intern/abc_nurbs.h
b/source/blender/alembic/intern/abc_nurbs.h
index 0b03254..adca013 100644
--- a/source/blender/alembic/intern/abc_nurbs.h
+++ b/source/blender/alembic/intern/abc_nurbs.h
@@ -34,7 +34,7 @@ public:
AbcNurbsWriter(Scene *scene,
Object *ob,
AbcTransformWriter *parent,
- uint32_t sampling_time,
+ uint32_t time_sampling,
ExportSettings &settings);
private:
diff --git a/source/blender/alembic/intern/abc_object.cc
b/source/blender/alembic/intern/abc_object.cc
index 80d27ff..0fd374d 100644
--- a/source/blender/alembic/intern/abc_object.cc
+++ b/source/blender/alembic/intern/abc_object.cc
@@ -60,13 +60,13 @@ using Alembic::AbcGeom::OStringProperty;
AbcObjectWriter::AbcObjectWriter(Scene *scene,
Object *ob,
- uint32_t sampling_time,
+ uint32_t time_sampling,
ExportSettings &settings,
AbcObjectWriter *parent)
: m_object(ob)
, m_settings(settings)
, m_scene(scene)
- , m_time_sampling(sampling_time)
+ , m_time_sampling(time_sampling)
, m_first_frame(true)
{
m_name = get_id_name(m_object) + "Shape";
diff --git a/source/blender/alembic/intern/abc_object.h
b/source/blender/alembic/intern/abc_object.h
index 8eb4a97..df0cbe3 100644
--- a/source/blender/alembic/intern/abc_object.h
+++ b/source/blender/alembic/intern/abc_object.h
@@ -56,7 +56,7 @@ protected:
public:
AbcObjectWriter(Scene *scene,
Object *ob,
- uint32_t sampling_time,
+ uint32_t time_sampling,
ExportSettings &settings,
AbcObjectWriter *parent = NULL);
diff --git a/source/blender/alembic/intern/abc_points.cc
b/source/blender/alembic/intern/abc_points.cc
index 184ce86..fc016ef 100644
--- a/source/blender/alembic/intern/abc_points.cc
+++ b/source/blender/alembic/intern/abc_points.cc
@@ -58,10 +58,10 @@ using Alembic::AbcGeom::OPointsSchema;
AbcPointsWriter::AbcPointsWriter(Scene *scene,
Object *ob,
AbcTransformWriter *parent,
- uint32_t sampling_time,
+ uint32_t time_sampling,
ExportSettings &settings,
ParticleSystem *psys)
- : AbcObjectWriter(scene, ob, sampling_time, settings, parent)
+ : AbcObjectWriter(scene, ob, time_sampling, settings, parent)
{
m_psys = psys;
diff --git a/source/blender/alembic/intern/abc_points.h
b/source/blender/alembic/intern/abc_points.h
index b171005..a32307f 100644
--- a/source/blender/alembic/intern/abc_points.h
+++ b/source/blender/alembic/intern/abc_points.h
@@ -39,7 +39,7 @@ public:
AbcPointsWriter(Scene *scene,
Object *ob,
AbcTransformWriter *parent,
- uint32_t sampling_time,
+ uint32_t time_sampling,
ExportSettings &settings,
ParticleSystem *psys);
diff --git a/source/blender/alembic/intern/abc_transform.cc
b/source/blender/alembic/intern/abc_transform.cc
index e1c05d4..0a1a531 100644
--- a/source/blender/alembic/intern/abc_transform.cc
+++ b/source/blender/alembic/intern/abc_transform.cc
@@ -42,18 +42,18 @@ using Alembic::AbcGeom::OXform;
AbcTransformWriter::AbcTransformWriter(Object *ob,
const OObject &abc_parent,
AbcTransformWriter *parent,
- unsigned int sampling_time,
+ unsigned int time_sampling,
ExportSettings &settings)
- : AbcObjectWriter(NULL, ob, sampling_time, settings, parent)
+ : AbcObjectWriter(NULL, ob, time_sampling, settings, parent)
{
m_is_animated = hasAnimation(m_object);
m_parent = NULL;
if (!m_is_animated) {
- sampling_time = 0;
+ time_sampling = 0;
}
- m_xform = OXform(abc_parent, get_id_name(m_object), sampling_time);
+ m_xform = OXform(abc_parent, get_id_name(m_object), time_sampling);
m_schema = m_xform.getSchema();
}
diff --git a/source/blender/alembic/intern/abc_transform.h
b/source/blender/alembic/intern/abc_transform.h
index a9d3ae7..049b007 100644
--- a/source/blender/alembic/intern/abc_transform.h
+++ b/source/blender/alembic/intern/abc_transform.h
@@ -43,7 +43,7 @@ public:
AbcTransformWriter(Object *ob,
const Alembic::AbcGeom::OObject &abc_parent,
AbcTransformWriter *parent,
- unsigned int sampling_time,
+ unsigned int time_sampling,
ExportSettings &settings);
Alembic::AbcGeom::OXform &alembicXform() { return m_xform;}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
