diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-03-24 06:51:46 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-03-24 06:51:46 +0400 |
commit | 2f348d8b5d7d897ad44d192a2fd5f2b99b906c76 (patch) | |
tree | 1b2612031fd1cb0e521c2e0e444e7b0bd2b77646 /source/blender/blenkernel | |
parent | d6fd5266d0514e6d31fd0e11aab5322846d78589 (diff) |
style cleanup: mainly for mesh code, also some WM function use.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/intern/anim.c | 1 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/blender.c | 12 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/camera.c | 8 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/library.c | 11 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/mesh.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/scene.c | 8 |
6 files changed, 18 insertions, 24 deletions
diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c index 743cfba0185..48d863150bc 100644 --- a/source/blender/blenkernel/intern/anim.c +++ b/source/blender/blenkernel/intern/anim.c @@ -29,7 +29,6 @@ * \ingroup bke */ - #include <stdio.h> #include <math.h> #include <string.h> diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c index 2ef93dd7fa3..1bb6841cd36 100644 --- a/source/blender/blenkernel/intern/blender.c +++ b/source/blender/blenkernel/intern/blender.c @@ -31,13 +31,13 @@ #ifndef _WIN32 - #include <unistd.h> // for read close +# include <unistd.h> // for read close #else - #include <io.h> // for open close read - #define open _open - #define read _read - #define close _close - #define write _write +# include <io.h> // for open close read +# define open _open +# define read _read +# define close _close +# define write _write #endif #include <stdlib.h> diff --git a/source/blender/blenkernel/intern/camera.c b/source/blender/blenkernel/intern/camera.c index 7180d157b96..a6651e25a5f 100644 --- a/source/blender/blenkernel/intern/camera.c +++ b/source/blender/blenkernel/intern/camera.c @@ -312,10 +312,10 @@ void camera_params_compute_viewplane(CameraParams *params, int winx, int winy, f /* compute view plane: * fully centered, zbuffer fills in jittered between -.5 and +.5 */ - viewplane.xmin= -0.5f*(float)winx; - viewplane.ymin= -0.5f*params->ycor*(float)winy; - viewplane.xmax= 0.5f*(float)winx; - viewplane.ymax= 0.5f*params->ycor*(float)winy; + viewplane.xmin = -0.5f*(float)winx; + viewplane.ymin = -0.5f*params->ycor*(float)winy; + viewplane.xmax = 0.5f*(float)winx; + viewplane.ymax = 0.5f*params->ycor*(float)winy; /* lens shift and offset */ dx= params->shiftx*viewfac + winx*params->offsetx; diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c index 158319a802f..3bfccea4780 100644 --- a/source/blender/blenkernel/intern/library.c +++ b/source/blender/blenkernel/intern/library.c @@ -27,16 +27,11 @@ /** \file blender/blenkernel/intern/library.c * \ingroup bke + * + * Contains management of ID's and libraries + * allocate and free of all library data */ - -/* - * Contains management of ID's and libraries - * allocate and free of all library data - * - */ - - #include <stdio.h> #include <ctype.h> #include <string.h> diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index 5dfabc64442..496c72ce2f8 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -3100,7 +3100,7 @@ void BKE_mesh_ensure_navmesh(Mesh *me) if (!CustomData_has_layer(&me->pdata, CD_RECAST)) { int i; int numFaces = me->totpoly; - int* recastData; + int *recastData; CustomData_add_layer_named(&me->pdata, CD_RECAST, CD_CALLOC, NULL, numFaces, "recastData"); recastData = (int*)CustomData_get_layer(&me->pdata, CD_RECAST); for (i=0; i<numFaces; i++) { diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 5c59f4c741c..7c242da9aff 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -396,10 +396,10 @@ Scene *add_scene(const char *name) sce->r.simplify_shadowsamples= 16; sce->r.simplify_aosss= 1.0f; - sce->r.border.xmin= 0.0f; - sce->r.border.ymin= 0.0f; - sce->r.border.xmax= 1.0f; - sce->r.border.ymax= 1.0f; + sce->r.border.xmin = 0.0f; + sce->r.border.ymin = 0.0f; + sce->r.border.xmax = 1.0f; + sce->r.border.ymax = 1.0f; sce->toolsettings = MEM_callocN(sizeof(struct ToolSettings),"Tool Settings Struct"); sce->toolsettings->cornertype=1; |