archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Code cleanup: double/float

Browse Source
This commit is contained in:
Campbell Barton
2014-03-19 07:07:59 +11:00
parent df25dbf917
commit ca6d76a915
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/bmesh/operators/bmo_connect.c
View File

@@ -106,6 +106,7 @@ static int bm_face_connect_verts(BMesh *bm, BMFace *f)
} }
else { else {
f_new = NULL; f_new = NULL;
l_new = NULL;
} }
f = f_new; f = f_new;

6
source/blender/compositor/intern/COM_MemoryBuffer.cpp
View File

@@ -218,8 +218,8 @@ static void ellipse_bounds(float A, float B, float C, float F, float &xmax, floa
{ {
float denom = 4.0f * A * C - B * B; float denom = 4.0f * A * C - B * B;
if (denom > 0.0f && A != 0.0f && C != 0.0f) { if (denom > 0.0f && A != 0.0f && C != 0.0f) {
xmax = sqrt(F) / (2.0f * A) * (sqrt(F * (4.0f * A - B * B / C)) + B * B * sqrt(F / (C * denom))); xmax = sqrtf(F) / (2.0f * A) * (sqrtf(F * (4.0f * A - B * B / C)) + B * B * sqrtf(F / (C * denom)));
ymax = sqrt(F) / (2.0f * C) * (sqrt(F * (4.0f * C - B * B / A)) + B * B * sqrt(F / (A * denom))); ymax = sqrtf(F) / (2.0f * C) * (sqrtf(F * (4.0f * C - B * B / A)) + B * B * sqrtf(F / (A * denom)));
} }
else { else {
xmax = 0.0f; xmax = 0.0f;
@@ -272,7 +272,7 @@ void MemoryBuffer::readEWA(float result[4], const float uv[2], const float deriv
int U0 = (int)u; int U0 = (int)u;
int V0 = (int)v; int V0 = (int)v;
/* pixel offset for interpolation */ /* pixel offset for interpolation */
float ufac = u - floor(u), vfac = v - floor(v); float ufac = u - floorf(u), vfac = v - floorf(v);
/* filter size */ /* filter size */
int u1 = (int)(u - ue); int u1 = (int)(u - ue);
int u2 = (int)(u + ue); int u2 = (int)(u + ue);