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

Style Cleanup

Browse Source
This commit is contained in:
Campbell Barton
2013-12-10 13:44:46 +11:00
parent 07d0926796
commit 8dc80e9d73
10 changed files with 37 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -227,7 +227,8 @@ static void ellipse_bounds(float A, float B, float C, float F, float &xmax, floa
}
}
static void ellipse_params(float Ux, float Uy, float Vx, float Vy, float &A, float &B, float &C, float &F, float &umax, float &vmax)
static void ellipse_params(float Ux, float Uy, float Vx, float Vy,
float &A, float &B, float &C, float &F, float &umax, float &vmax)
{
A = Vx * Vx + Vy * Vy;
B = -2.0f * (Ux * Vx + Uy * Vy);
@@ -287,9 +288,9 @@ void MemoryBuffer::readEWA(float result[4], const float uv[2], const float deriv
if (V0 - v1 > EWA_MAXIDX) v1 = V0 - EWA_MAXIDX;
if (v2 - V0 > EWA_MAXIDX) v2 = V0 + EWA_MAXIDX;
float DDQ = 2.f * A;
float DDQ = 2.0f * A;
float U = u1 - U0;
float ac1 = A * (2.f*U + 1.f);
float ac1 = A * (2.0f * U + 1.0f);
float ac2 = A * U * U;
float BU = B * U;

2
source/blender/editors/space_file/file_ops.c
View File

@@ -1253,7 +1253,7 @@ void file_directory_enter_handle(bContext *C, void *UNUSED(arg_unused), void *UN
void file_filename_enter_handle(bContext *C, void *UNUSED(arg_unused), void *arg_but)
{
SpaceFile *sfile = CTX_wm_space_file(C);
uiBut *but = (uiBut*)arg_but;
uiBut *but = arg_but;
char matched_file[FILE_MAX];
char filepath[sizeof(sfile->params->dir)];

3
source/blender/nodes/composite/node_composite_tree.c
View File

@@ -218,7 +218,8 @@ static void update(bNodeTree *ntree)
}
}
static void composite_node_add_init(bNodeTree *UNUSED(bnodetree), bNode *bnode) {
static void composite_node_add_init(bNodeTree *UNUSED(bnodetree), bNode *bnode)
{
/* Composite node will only show previews for input classes
* by default, other will be hidden
* but can be made visible with the show_preview option */