[Bf-blender-cvs] [41e0085fd3] master: [Alembic] Fix msvc warning - C4138 '*/' found outside of comment

[lazydodo]

Commit: 41e0085fd3af90612d034ad19cec3aa4cb686688
Author: lazydodo
Date:   Wed Feb 15 12:40:41 2017 -0700
Branches: master
https://developer.blender.org/rB41e0085fd3af90612d034ad19cec3aa4cb686688

[Alembic] Fix msvc warning - C4138  '*/' found outside of comment

===================================================================

M       source/blender/alembic/intern/abc_curves.cc
M       source/blender/alembic/intern/abc_points.cc
M       source/blender/alembic/intern/abc_transform.cc

===================================================================

diff --git a/source/blender/alembic/intern/abc_curves.cc 
b/source/blender/alembic/intern/abc_curves.cc
index 282777f3af..0542255d84 100644
--- a/source/blender/alembic/intern/abc_curves.cc
+++ b/source/blender/alembic/intern/abc_curves.cc
@@ -361,7 +361,7 @@ void read_curve_sample(Curve *cu, const ICurvesSchema 
&schema, const float time)
  * object directly and create a new DerivedMesh from that. Also we might need 
to
  * create new or delete existing NURBS in the curve.
  */
-DerivedMesh *AbcCurveReader::read_derivedmesh(DerivedMesh */*dm*/, const float 
time, int /*read_flag*/, const char **/*err_str*/)
+DerivedMesh *AbcCurveReader::read_derivedmesh(DerivedMesh * /*dm*/, const 
float time, int /*read_flag*/, const char ** /*err_str*/)
 {
        ISampleSelector sample_sel(time);
        const ICurvesSchema::Sample sample = 
m_curves_schema.getValue(sample_sel);
diff --git a/source/blender/alembic/intern/abc_points.cc 
b/source/blender/alembic/intern/abc_points.cc
index 4c78f3e83c..fc84759b1d 100644
--- a/source/blender/alembic/intern/abc_points.cc
+++ b/source/blender/alembic/intern/abc_points.cc
@@ -200,7 +200,7 @@ void read_points_sample(const IPointsSchema &schema,
        read_mverts(config.mvert, positions, vnormals);
 }
 
-DerivedMesh *AbcPointsReader::read_derivedmesh(DerivedMesh *dm, const float 
time, int /*read_flag*/, const char **/*err_str*/)
+DerivedMesh *AbcPointsReader::read_derivedmesh(DerivedMesh *dm, const float 
time, int /*read_flag*/, const char ** /*err_str*/)
 {
        ISampleSelector sample_sel(time);
        const IPointsSchema::Sample sample = m_schema.getValue(sample_sel);
diff --git a/source/blender/alembic/intern/abc_transform.cc 
b/source/blender/alembic/intern/abc_transform.cc
index 368a811bb2..2c6ef09326 100644
--- a/source/blender/alembic/intern/abc_transform.cc
+++ b/source/blender/alembic/intern/abc_transform.cc
@@ -122,7 +122,7 @@ Imath::Box3d AbcTransformWriter::bounds()
        return Imath::transform(bounds, m_matrix);
 }
 
-bool AbcTransformWriter::hasAnimation(Object */*ob*/) const
+bool AbcTransformWriter::hasAnimation(Object * /*ob*/) const
 {
        /* TODO(kevin): implement this. */
        return true;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs