[Bf-blender-cvs] [bfea06a6392] soc-2020-io-performance: Fix a bad default assignment and an unused parameter.
Howard Trickey
noreply at git.blender.org
Sat Mar 27 14:18:29 CET 2021
Commit: bfea06a6392fc5204624f98bf445d0005081b9ba
Author: Howard Trickey
Date: Sat Mar 27 08:52:57 2021 -0400
Branches: soc-2020-io-performance
https://developer.blender.org/rBbfea06a6392fc5204624f98bf445d0005081b9ba
Fix a bad default assignment and an unused parameter.
===================================================================
M source/blender/io/wavefront_obj/importer/obj_import_nurbs.cc
M source/blender/io/wavefront_obj/tests/obj_exporter_tests.hh
===================================================================
diff --git a/source/blender/io/wavefront_obj/importer/obj_import_nurbs.cc b/source/blender/io/wavefront_obj/importer/obj_import_nurbs.cc
index 20c6eb4e00f..ed5dda2be34 100644
--- a/source/blender/io/wavefront_obj/importer/obj_import_nurbs.cc
+++ b/source/blender/io/wavefront_obj/importer/obj_import_nurbs.cc
@@ -70,7 +70,7 @@ void CurveFromGeometry::create_curve(Main *bmain, const OBJImportParams &import_
/**
* Create a NURBS spline for the Curve converted from Geometry.
*/
-void CurveFromGeometry::create_nurbs(const OBJImportParams &import_params)
+void CurveFromGeometry::create_nurbs(const OBJImportParams & /*import_params */)
{
const NurbsElement &nurbs_geometry = curve_geometry_.nurbs_elem();
Nurb *nurb = static_cast<Nurb *>(blender_curve_->nurb.first);
diff --git a/source/blender/io/wavefront_obj/tests/obj_exporter_tests.hh b/source/blender/io/wavefront_obj/tests/obj_exporter_tests.hh
index e91d93fcaf9..6cc2abcf605 100644
--- a/source/blender/io/wavefront_obj/tests/obj_exporter_tests.hh
+++ b/source/blender/io/wavefront_obj/tests/obj_exporter_tests.hh
@@ -77,7 +77,7 @@ struct OBJExportParamsDefault {
OBJExportParamsDefault()
{
params.filepath[0] = '\0';
- params.blen_filepath = '\0';
+ params.blen_filepath = "";
params.export_animation = false;
params.start_frame = 0;
params.end_frame = 1;
More information about the Bf-blender-cvs
mailing list