diff options
Diffstat (limited to 'source/blender/freestyle/intern')
6 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp index ee584f8953c..741c7d6ea41 100644 --- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp +++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp @@ -61,7 +61,7 @@ NodeGroup *BlenderFileLoader::Load() _viewplane_bottom = _re->viewplane.ymin; _viewplane_top = _re->viewplane.ymax; - if (_re->clip_start < 0.f) { + if (_re->clip_start < 0.0f) { // Adjust clipping start/end and set up a Z offset when the viewport preview // is used with the orthographic view. In this case, _re->clip_start is negative, // while Freestyle assumes that imported mesh data are in the camera coordinate @@ -73,7 +73,7 @@ NodeGroup *BlenderFileLoader::Load() else { _z_near = -_re->clip_start; _z_far = -_re->clip_end; - _z_offset = 0.f; + _z_offset = 0.0f; } #if 0 @@ -577,7 +577,7 @@ void BlenderFileLoader::insertShapeNode(Object *ob, Mesh *me, int id) tmpMat.setLine(mat->line_col[0], mat->line_col[1], mat->line_col[2], mat->line_col[3]); tmpMat.setDiffuse(mat->r, mat->g, mat->b, 1.0f); tmpMat.setSpecular(mat->specr, mat->specg, mat->specb, 1.0f); - tmpMat.setShininess(128.f); + tmpMat.setShininess(128.0f); tmpMat.setPriority(mat->line_priority); } diff --git a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp index 2446bfc13dc..9680e7d25a3 100644 --- a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp +++ b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp @@ -150,10 +150,10 @@ static void init_view(Render *re) float thickness = 1.0f; switch (re->r.line_thickness_mode) { case R_LINE_THICKNESS_ABSOLUTE: - thickness = re->r.unit_line_thickness * (re->r.size / 100.f); + thickness = re->r.unit_line_thickness * (re->r.size / 100.0f); break; case R_LINE_THICKNESS_RELATIVE: - thickness = height / 480.f; + thickness = height / 480.0f; break; } diff --git a/source/blender/freestyle/intern/image/ImagePyramid.h b/source/blender/freestyle/intern/image/ImagePyramid.h index ee8bf69aa10..3b4e5eda52a 100644 --- a/source/blender/freestyle/intern/image/ImagePyramid.h +++ b/source/blender/freestyle/intern/image/ImagePyramid.h @@ -87,7 +87,7 @@ class GaussianPyramid : public ImagePyramid { float _sigma; public: - GaussianPyramid(float iSigma = 1.f) : ImagePyramid() + GaussianPyramid(float iSigma = 1.0f) : ImagePyramid() { _sigma = iSigma; } diff --git a/source/blender/freestyle/intern/stroke/Chain.cpp b/source/blender/freestyle/intern/stroke/Chain.cpp index 562ca32be78..4a0f31bc910 100644 --- a/source/blender/freestyle/intern/stroke/Chain.cpp +++ b/source/blender/freestyle/intern/stroke/Chain.cpp @@ -53,7 +53,7 @@ void Chain::push_viewedge_back(ViewEdge *iViewEdge, bool orientation) } // Ensure the continuity of underlying FEdges CurvePoint *cp = - _Vertices.back(); // assumed to be instantiated as new CurvePoint(iSVertex, 0, 0.f); + _Vertices.back(); // assumed to be instantiated as new CurvePoint(iSVertex, 0, 0.0f); SVertex *sv_first = (*vfirst); FEdge *fe = _fedgeB->duplicate(); fe->setTemporary(true); @@ -117,7 +117,7 @@ void Chain::push_viewedge_front(ViewEdge *iViewEdge, bool orientation) } // Ensure the continuity of underlying FEdges CurvePoint *cp = - _Vertices.front(); // assumed to be instantiated as new CurvePoint(iSVertex, 0, 0.f); + _Vertices.front(); // assumed to be instantiated as new CurvePoint(iSVertex, 0, 0.0f); SVertex *sv_last = cp->A(); SVertex *sv_curr = (*v); FEdge *fe = (orientation) ? iViewEdge->fedgeA() : iViewEdge->fedgeB(); diff --git a/source/blender/freestyle/intern/stroke/Operators.cpp b/source/blender/freestyle/intern/stroke/Operators.cpp index 25954c7ecbf..05dbbb1304e 100644 --- a/source/blender/freestyle/intern/stroke/Operators.cpp +++ b/source/blender/freestyle/intern/stroke/Operators.cpp @@ -885,7 +885,7 @@ static int __recursiveSplit(Chain *_curve, #endif real _min = FLT_MAX; ++it; - real mean = 0.f; + real mean = 0.0f; // soc unused - real variance = 0.0f; unsigned count = 0; CurveInternal::CurvePointIterator next = it; diff --git a/source/blender/freestyle/intern/stroke/Stroke.cpp b/source/blender/freestyle/intern/stroke/Stroke.cpp index aa87dc473e2..e74a676ec79 100644 --- a/source/blender/freestyle/intern/stroke/Stroke.cpp +++ b/source/blender/freestyle/intern/stroke/Stroke.cpp @@ -691,7 +691,7 @@ int Stroke::Resample(float iSampling) ++next; } // add last: - if ((it != itend) && (next == itend) /* && (t == 0.f)*/) { + if ((it != itend) && (next == itend) /* && (t == 0.0f)*/) { newVertices.push_back(&(*it)); } |