style cleanup
authorCampbell Barton <ideasman42@gmail.com>
Sun, 30 Sep 2012 06:12:47 +0000 (06:12 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 30 Sep 2012 06:12:47 +0000 (06:12 +0000)
32 files changed:
release/windows/contrib/vfapi/vfapi-plugin.c
source/blender/blenkernel/intern/brush.c
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenkernel/intern/ipo.c
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/particle.c
source/blender/blenlib/intern/BLI_kdopbvh.c
source/blender/blenlib/intern/DLRB_tree.c
source/blender/blenlib/intern/string_utf8.c
source/blender/bmesh/intern/bmesh_mesh.c
source/blender/bmesh/operators/bmo_join_triangles.c
source/blender/bmesh/operators/bmo_primitive.c
source/blender/editors/animation/anim_markers.c
source/blender/editors/interface/interface_draw.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/mesh/editmesh_knife.c
source/blender/editors/physics/particle_edit.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/space_file/space_file.c
source/blender/editors/space_image/image_draw.c
source/blender/editors/space_info/space_info.c
source/blender/editors/space_userpref/space_userpref.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/space_view3d/view3d_snap.c
source/blender/imbuf/intern/radiance_hdr.c
source/blender/imbuf/intern/tiff.c
source/blender/nodes/composite/nodes/node_composite_directionalblur.c
source/blender/nodes/intern/node_common.c
source/blender/python/intern/bpy_util.c
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/sunsky.c
source/blender/windowmanager/intern/wm_window.c

index 8e1bfb0f247610f5875d3766d9fe4b445279d2fd..8d63baa0ce42fd5d617c6ce7482cbeeabe27ee30 100644 (file)
@@ -188,7 +188,7 @@ HRESULT __stdcall VF_OpenFileFunc_Blen(
        SOCKET s_in;
        char buf[256];
        struct sockaddr_in      addr;
-       FILEfp;
+       FILE *fp;
 
        p = lpFileName;
        while (*p && *p != '.') p++;
@@ -229,7 +229,7 @@ HRESULT __stdcall VF_OpenFileFunc_Blen(
                return VF_ERROR;
        }
 
-       rval = (conndesc*) malloc(sizeof(conndesc));
+       rval = (conndesc *) malloc(sizeof(conndesc));
 
        rval->addr = addr;
 
@@ -281,7 +281,7 @@ HRESULT __stdcall VF_OpenFileFunc_Blen(
 HRESULT __stdcall VF_CloseFileFunc_Blen( 
        VF_FileHandle hFileHandle )
 {
-       free((conndesc*) hFileHandle);
+       free((conndesc *) hFileHandle);
 
        return VF_OK;
 }
@@ -290,7 +290,7 @@ HRESULT __stdcall VF_GetFileInfoFunc_Blen(
        VF_FileHandle hFileHandle,
        LPVF_FileInfo lpFileInfo )
 {
-       conndesc * c = (conndesc*) hFileHandle;
+       conndesc *c = (conndesc *) hFileHandle;
        if (c == 0) { 
                return VF_ERROR; 
        }
@@ -385,10 +385,10 @@ HRESULT __stdcall VF_ReadDataFunc_Blen(
        framebuf = (unsigned char*) v->lpData;
 
        for (y = 0; y < height; y++) {
-               unsigned char * p = framebuf + v->lPitch * y;
-               unsigned char * e = p + width * 3;
+               unsigned char *p = framebuf + v->lPitch * y;
+               unsigned char *e = p + width * 3;
 
-               my_recv(s_in, (char*) p, width * 3);
+               my_recv(s_in, (char *)p, width * 3);
                while (p != e) {
                        unsigned char tmp = p[2];
                        p[2] = p[0];
index fde95e0767eb30bd3ef60b582e9068958c1ee401..ce39eea5ceb084c7873736d850d2692b2fe07369 100644 (file)
@@ -529,7 +529,7 @@ void BKE_brush_imbuf_new(const Scene *scene, Brush *brush, short flt, short texf
        unsigned char *dst, crgb[3];
        const float alpha = BKE_brush_alpha_get(scene, brush);
        float brush_rgb[3];
-    
+
        imbflag = (flt) ? IB_rectfloat : IB_rect;
        xoff = -bufsize / 2.0f + 0.5f;
        yoff = -bufsize / 2.0f + 0.5f;
@@ -563,7 +563,7 @@ void BKE_brush_imbuf_new(const Scene *scene, Brush *brush, short flt, short texf
                                else {
                                        BKE_brush_sample_tex(scene, brush, xy, rgba, 0);
                                        mul_v3_v3v3(dstf, rgba, brush_rgb);
-                                       dstf[3] = rgba[3] *alpha *BKE_brush_curve_strength_clamp(brush, len_v2(xy), radius);
+                                       dstf[3] = rgba[3] * alpha * BKE_brush_curve_strength_clamp(brush, len_v2(xy), radius);
                                }
                        }
                }
@@ -594,7 +594,7 @@ void BKE_brush_imbuf_new(const Scene *scene, Brush *brush, short flt, short texf
                                else if (texfall == 2) {
                                        BKE_brush_sample_tex(scene, brush, xy, rgba, 0);
                                        mul_v3_v3(rgba, brush->rgb);
-                                       alpha_f = rgba[3] *alpha *BKE_brush_curve_strength_clamp(brush, len_v2(xy), radius);
+                                       alpha_f = rgba[3] * alpha * BKE_brush_curve_strength_clamp(brush, len_v2(xy), radius);
 
                                        rgb_float_to_uchar(dst, rgba);
 
@@ -602,7 +602,7 @@ void BKE_brush_imbuf_new(const Scene *scene, Brush *brush, short flt, short texf
                                }
                                else {
                                        BKE_brush_sample_tex(scene, brush, xy, rgba, 0);
-                                       alpha_f = rgba[3] *alpha *BKE_brush_curve_strength_clamp(brush, len_v2(xy), radius);
+                                       alpha_f = rgba[3] * alpha * BKE_brush_curve_strength_clamp(brush, len_v2(xy), radius);
 
                                        dst[0] = crgb[0];
                                        dst[1] = crgb[1];
index 7d061d9641b84382136a90aea40ddd1f994b773f..d55848514cc7ab59a2fcd02e25e8aed43bf7b742 100644 (file)
@@ -4224,7 +4224,7 @@ static void dynamicPaint_doEffectStep(DynamicPaintSurface *surface, float *force
                                /* Only continue if surrounding point has higher wetness */
                                if (ePoint->wetness < pPoint->wetness || ePoint->wetness < MIN_WETNESS) continue;
 
-                               w_factor = 1.0f / numOfNeighs *MIN2(ePoint->wetness, 1.0f) * speed_scale;
+                               w_factor = 1.0f / numOfNeighs * MIN2(ePoint->wetness, 1.0f) * speed_scale;
                                CLAMP(w_factor, 0.0f, 1.0f);
 
                                /* mix new wetness and color */
index 5f9c420e39565703058d062c2ff4c4f59e012c0d..953ee673f6b994a65db1ede600c730924c759ede 100644 (file)
@@ -1765,7 +1765,7 @@ void do_versions_ipos_to_animato(Main *main)
                                                /* Any actuators set to ACT_IPO at this point are actually Action Actuators that
                                                   need this converted IPO to finish converting the actuator. */
                                                if (act->type == ACT_IPO) {
-                                                       aa = (bActionActuator*)act->data;
+                                                       aa = (bActionActuator *)act->data;
                                                        aa->act = ob->adt->action;
                                                        act->type = ACT_ACTION;
                                                }
index 5b766d0ee322cd014a3646091f65a32447657c92..bea0e33da9a900be956c89c1226875206f4c1767 100644 (file)
@@ -1327,9 +1327,9 @@ void ramp_blend(int type, float r_col[3], const float fac, const float col[3])
                                r_col[2] = facm * (r_col[2]) + fac * (r_col[2]) / col[2];
                        break;
                case MA_RAMP_DIFF:
-                       r_col[0] = facm * (r_col[0]) + fac *fabsf(r_col[0] - col[0]);
-                       r_col[1] = facm * (r_col[1]) + fac *fabsf(r_col[1] - col[1]);
-                       r_col[2] = facm * (r_col[2]) + fac *fabsf(r_col[2] - col[2]);
+                       r_col[0] = facm * (r_col[0]) + fac * fabsf(r_col[0] - col[0]);
+                       r_col[1] = facm * (r_col[1]) + fac * fabsf(r_col[1] - col[1]);
+                       r_col[2] = facm * (r_col[2]) + fac * fabsf(r_col[2] - col[2]);
                        break;
                case MA_RAMP_DARK:
                        tmp = col[0] + ((1 - col[0]) * facm);
index 8956944a63f4aa80a2278f6a9efc71ec8e619784..e8af794eaea8ad6adef3c626012dc6e77af9b966 100644 (file)
@@ -3776,7 +3776,7 @@ static void get_cpa_texture(DerivedMesh *dm, ParticleSystem *psys, ParticleSetti
                                                                 ptex->gravity = ptex->field = ptex->time = ptex->clump = ptex->kink =
                                                                                                                              ptex->effector = ptex->rough1 = ptex->rough2 = ptex->roughe = 1.f;
 
-       ptex->length = 1.0f - part->randlength *PSYS_FRAND(child_index + 26);
+       ptex->length = 1.0f - part->randlength * PSYS_FRAND(child_index + 26);
        ptex->length *= part->clength_thres < PSYS_FRAND(child_index + 27) ? part->clength : 1.0f;
 
        for (m = 0; m < MAX_MTEX; m++, mtexp++) {
@@ -3968,7 +3968,7 @@ float psys_get_child_size(ParticleSystem *psys, ChildParticle *cpa, float UNUSED
        size *= part->childsize;
 
        if (part->childrandsize != 0.0f)
-               size *= 1.0f - part->childrandsize *PSYS_FRAND(cpa - psys->child + 26);
+               size *= 1.0f - part->childrandsize * PSYS_FRAND(cpa - psys->child + 26);
 
        return size;
 }
index 167797946bcbf11c1539072eb8a600954d2d206f..a86783f34500a50594b3f6500e048a80609993a2 100644 (file)
@@ -705,8 +705,8 @@ static void non_recursive_bvh_div_nodes(BVHTree *tree, BVHNode *branches_array,
        BVHNode *tmp = branches_array + 0;
        tmp->parent = NULL;
 
-       /*Most of bvhtree code relies on 1-leaf trees having at least one branch
-        *We handle that special case here */
+       /* Most of bvhtree code relies on 1-leaf trees having at least one branch
+        * We handle that special case here */
        if (num_leafs == 1) {
                BVHNode *root = branches_array + 0;
                refit_kdop_hull(tree, root, 0, num_leafs);
index 930ab4fc4008603319a839d45ceccdb8e7fd9bad..858eef0b2dfe126d016b9f031a8795542325e1c5 100644 (file)
@@ -364,7 +364,7 @@ static void rotate_right(DLRBT_Tree *tree, DLRBT_Node *root)
                        root_slot = &root->parent->right;
        }
        else
-               root_slot = ((DLRBT_Node **)&tree->root);  /* &((DLRBT_Node*)tree->root); */
+               root_slot = ((DLRBT_Node **)&tree->root);  /* &((DLRBT_Node *)tree->root); */
                
        /* - pivot's right child becomes root's left child
         * - root now becomes pivot's right child  
index f5c09791a68b9ccd652d149836857d95a059d655..17b9ed7ea8dd3f81b10d8255b49f820f0ec756a2 100644 (file)
@@ -58,11 +58,11 @@ static const char trailingBytesForUTF8[256] = {
 
 int BLI_utf8_invalid_byte(const char *str, int length)
 {
-       const unsigned char *p, *pend = (unsigned char*)str + length;
+       const unsigned char *p, *pend = (unsigned char *)str + length;
        unsigned char c;
        int ab;
 
-       for (p = (unsigned char*)str; p < pend; p++) {
+       for (p = (unsigned char *)str; p < pend; p++) {
                c = *p;
                if (c < 128)
                        continue;
index 734f08142b1ae9c8d349f2ddb6dc0407c7cd3d5a..0d072da5327d4f6eee7b6e11ece5ed3aae0583e5 100644 (file)
@@ -665,7 +665,7 @@ void BM_mesh_remap(BMesh *bm, int *vert_idx, int *edge_idx, int *face_idx)
        /* Verts' pointers, only edge pointers... */
        if (eptr_map) {
                BM_ITER_MESH (ve, &iter, bm, BM_VERTS_OF_MESH) {
-/*                     printf("Vert e: %p -> %p\n", ve->e, BLI_ghash_lookup(eptr_map, (const void*)ve->e));*/
+/*                     printf("Vert e: %p -> %p\n", ve->e, BLI_ghash_lookup(eptr_map, (const void *)ve->e));*/
                        ve->e = BLI_ghash_lookup(eptr_map, (const void *)ve->e);
                }
        }
@@ -675,20 +675,20 @@ void BM_mesh_remap(BMesh *bm, int *vert_idx, int *edge_idx, int *face_idx)
        if (vptr_map || eptr_map) {
                BM_ITER_MESH (ed, &iter, bm, BM_EDGES_OF_MESH) {
                        if (vptr_map) {
-/*                             printf("Edge v1: %p -> %p\n", ed->v1, BLI_ghash_lookup(vptr_map, (const void*)ed->v1));*/
-/*                             printf("Edge v2: %p -> %p\n", ed->v2, BLI_ghash_lookup(vptr_map, (const void*)ed->v2));*/
+/*                             printf("Edge v1: %p -> %p\n", ed->v1, BLI_ghash_lookup(vptr_map, (const void *)ed->v1));*/
+/*                             printf("Edge v2: %p -> %p\n", ed->v2, BLI_ghash_lookup(vptr_map, (const void* )ed->v2));*/
                                ed->v1 = BLI_ghash_lookup(vptr_map, (const void *)ed->v1);
                                ed->v2 = BLI_ghash_lookup(vptr_map, (const void *)ed->v2);
                        }
                        if (eptr_map) {
 /*                             printf("Edge v1_disk_link prev: %p -> %p\n", ed->v1_disk_link.prev,*/
-/*                                    BLI_ghash_lookup(eptr_map, (const void*)ed->v1_disk_link.prev));*/
+/*                                    BLI_ghash_lookup(eptr_map, (const void *)ed->v1_disk_link.prev));*/
 /*                             printf("Edge v1_disk_link next: %p -> %p\n", ed->v1_disk_link.next,*/
-/*                                    BLI_ghash_lookup(eptr_map, (const void*)ed->v1_disk_link.next));*/
+/*                                    BLI_ghash_lookup(eptr_map, (const void *)ed->v1_disk_link.next));*/
 /*                             printf("Edge v2_disk_link prev: %p -> %p\n", ed->v2_disk_link.prev,*/
-/*                                    BLI_ghash_lookup(eptr_map, (const void*)ed->v2_disk_link.prev));*/
+/*                                    BLI_ghash_lookup(eptr_map, (const void *)ed->v2_disk_link.prev));*/
 /*                             printf("Edge v2_disk_link next: %p -> %p\n", ed->v2_disk_link.next,*/
-/*                                    BLI_ghash_lookup(eptr_map, (const void*)ed->v2_disk_link.next));*/
+/*                                    BLI_ghash_lookup(eptr_map, (const void *)ed->v2_disk_link.next));*/
                                ed->v1_disk_link.prev = BLI_ghash_lookup(eptr_map, (const void *)ed->v1_disk_link.prev);
                                ed->v1_disk_link.next = BLI_ghash_lookup(eptr_map, (const void *)ed->v1_disk_link.next);
                                ed->v2_disk_link.prev = BLI_ghash_lookup(eptr_map, (const void *)ed->v2_disk_link.prev);
@@ -701,15 +701,15 @@ void BM_mesh_remap(BMesh *bm, int *vert_idx, int *edge_idx, int *face_idx)
        BM_ITER_MESH (fa, &iter, bm, BM_FACES_OF_MESH) {
                BM_ITER_ELEM (lo, &iterl, fa, BM_LOOPS_OF_FACE) {
                        if (vptr_map) {
-/*                             printf("Loop v: %p -> %p\n", lo->v, BLI_ghash_lookup(vptr_map, (const void*)lo->v));*/
+/*                             printf("Loop v: %p -> %p\n", lo->v, BLI_ghash_lookup(vptr_map, (const void *)lo->v));*/
                                lo->v = BLI_ghash_lookup(vptr_map, (const void *)lo->v);
                        }
                        if (eptr_map) {
-/*                             printf("Loop e: %p -> %p\n", lo->e, BLI_ghash_lookup(eptr_map, (const void*)lo->e));*/
+/*                             printf("Loop e: %p -> %p\n", lo->e, BLI_ghash_lookup(eptr_map, (const void *)lo->e));*/
                                lo->e = BLI_ghash_lookup(eptr_map, (const void *)lo->e);
                        }
                        if (fptr_map) {
-/*                             printf("Loop f: %p -> %p\n", lo->f, BLI_ghash_lookup(fptr_map, (const void*)lo->f));*/
+/*                             printf("Loop f: %p -> %p\n", lo->f, BLI_ghash_lookup(fptr_map, (const void *)lo->f));*/
                                lo->f = BLI_ghash_lookup(fptr_map, (const void *)lo->f);
                        }
                }
index 0d8b397110e221563675e0c8ad86d417f7b011fe..7191aa7a7b668c9b3174c97c1866439491e27a26 100644 (file)
@@ -163,8 +163,8 @@ static int bm_edge_faces_cmp(BMesh *bm, BMEdge *e, const int do_uv, const int do
                };
 
                if (lcol[0]) {
-                       if (!compare_rgb_uchar((unsigned char*)&lcol[0]->r, (unsigned char*)&lcol[2]->r, T2QCOL_LIMIT) ||
-                           !compare_rgb_uchar((unsigned char*)&lcol[1]->r, (unsigned char*)&lcol[3]->r, T2QCOL_LIMIT))
+                       if (!compare_rgb_uchar((unsigned char *)&lcol[0]->r, (unsigned char *)&lcol[2]->r, T2QCOL_LIMIT) ||
+                           !compare_rgb_uchar((unsigned char *)&lcol[1]->r, (unsigned char *)&lcol[3]->r, T2QCOL_LIMIT))
                        {
                                return FALSE;
                        }
index 58102c1c8be4a52974d8b26a18762476899992b3..30561e47d2055f052f707ecf6bc245ab64bbfce5 100644 (file)
@@ -309,7 +309,7 @@ void bmo_create_uvsphere_exec(BMesh *bm, BMOperator *op)
        phid /= 2;
        for (a = 0; a <= tot; a++) {
                /* Going in this direction, then edge extruding, makes normals face outward */
-               vec[0] = -dia *sinf(phi);
+               vec[0] = -dia * sinf(phi);
                vec[1] = 0.0;
                vec[2] = dia * cosf(phi);
                eve = BM_vert_create(bm, vec, NULL);
@@ -354,7 +354,7 @@ void bmo_create_uvsphere_exec(BMesh *bm, BMOperator *op)
        {
                float len, len2, vec2[3];
 
-               len = 2 *dia *sinf(phid / 2.0f);
+               len = 2 *dia * sinf(phid / 2.0f);
 
                /* length of one segment in shortest parallen */
                vec[0] = dia * sinf(phid);
@@ -526,7 +526,7 @@ void bmo_create_circle_exec(BMesh *bm, BMOperator *op)
 
        for (a = 0; a < segs; a++, phi += phid) {
                /* Going this way ends up with normal(s) upward */
-               vec[0] = -dia *sinf(phi);
+               vec[0] = -dia * sinf(phi);
                vec[1] = dia * cosf(phi);
                vec[2] = 0.0f;
                mul_m4_v3(mat, vec);
index 270e7fc8f900bdfa5cee64e77dd16137488294e7..895aaec29daf04dc07d4f51543c06946c84a4fbd 100644 (file)
@@ -504,7 +504,7 @@ static int ed_markers_poll_markers_exist(bContext *C)
  * "custom"/third-tier invoke() callback supplied as the last arg (which would normally
  * be the operator's invoke() callback elsewhere)
  *
- * < invoke_func: (fn(bContext*, wmOperator*, wmEvent*)=int) "standard" invoke function 
+ * < invoke_func: (fn(bContext *, wmOperator *, wmEvent *)=int) "standard" invoke function
  *                     that operator would otherwise have used. If NULL, the operator's standard
  *                     exec() callback will be called instead in the appropriate places.
  */
index e7c7d934f9fb2ec086ca5cfe8621859349635136..010df0cbfbce3b2649e4228f14badd02425bfa77 100644 (file)
@@ -954,12 +954,12 @@ void ui_draw_but_WAVEFORM(ARegion *ar, uiBut *but, uiWidgetColors *UNUSED(wcol),
 
 static float polar_to_x(float center, float diam, float ampli, float angle)
 {
-       return center + diam *ampli *cosf(angle);
+       return center + diam *ampli * cosf(angle);
 }
 
 static float polar_to_y(float center, float diam, float ampli, float angle)
 {
-       return center + diam *ampli *sinf(angle);
+       return center + diam *ampli * sinf(angle);
 }
 
 static void vectorscope_draw_target(float centerx, float centery, float diam, const float colf[3])
index 0100663e4c3cfd387dd525a41d67a603c3ef0ebc..bfa9cc2727c7a235fa10acd2a194d42428291e85 100644 (file)
@@ -1368,7 +1368,7 @@ static void ui_textedit_set_cursor_pos(uiBut *but, uiHandleButtonData *data, sho
 
                while (TRUE) {
                        /* XXX does not take zoom level into account */
-                       cdist = startx + aspect_sqrt *BLF_width(fstyle->uifont_id, origstr + but->ofs);
+                       cdist = startx + aspect_sqrt * BLF_width(fstyle->uifont_id, origstr + but->ofs);
 
                        /* check if position is found */
                        if (cdist < x) {
@@ -4707,8 +4707,8 @@ static int ui_but_menu(bContext *C, uiBut *but)
                
                /* Property Operators */
                
-               /*Copy Property Value
-                *Paste Property Value */
+               /* Copy Property Value
+                * Paste Property Value */
                
                if (length) {
                        uiItemBooleanO(layout, CTX_IFACE_(BLF_I18NCONTEXT_OPERATOR_DEFAULT, "Reset All to Default Values"),
index 5bee29205e4c85e3b38f80a374c2f38562607a9a..790fd0a7cf189e701c37065e8560e3be339d4648 100644 (file)
@@ -1158,7 +1158,7 @@ static BMEdgeHit *knife_edge_tri_isect(KnifeTool_OpData *kcd, BMBVHTree *bmtree,
 
        /* for comparing distances, error of intersection depends on triangle scale.
         * need to scale down before squaring for accurate comparison */
-       const float depsilon = 50 *FLT_EPSILON *len_v3_tri_side_max(v1, v2, v3);
+       const float depsilon = 50 *FLT_EPSILON * len_v3_tri_side_max(v1, v2, v3);
        const float depsilon_squared = depsilon * depsilon;
 
        copy_v3_v3(cos + 0, v1);
index 72bbcda2b5ec2521ba08ddc11a80c1621b446417..ea6f9d4cebbf21ca5174d60e4690d5609c498874 100644 (file)
@@ -328,7 +328,7 @@ void PE_hide_keys_time(Scene *scene, PTCacheEdit *edit, float cfra)
 static int pe_x_mirror(Object *ob)
 {
        if (ob->type == OB_MESH)
-               return (((Mesh*)ob->data)->editflag & ME_EDIT_MIRROR_X);
+               return (((Mesh *)ob->data)->editflag & ME_EDIT_MIRROR_X);
        
        return 0;
 }
@@ -2602,7 +2602,7 @@ void PARTICLE_OT_delete(wmOperatorType *ot)
 
 static void PE_mirror_x(Scene *scene, Object *ob, int tagged)
 {
-       Mesh *me= (Mesh*)(ob->data);
+       Mesh *me= (Mesh *)(ob->data);
        ParticleSystemModifierData *psmd;
        PTCacheEdit *edit= PE_get_current(scene, ob);
        ParticleSystem *psys = edit->psys;
@@ -3379,7 +3379,7 @@ static int brush_add(PEData *data, short number)
                                ppa= psys->particles+ptn[0].index;
 
                                for (k=0; k<pset->totaddkey; k++) {
-                                       thkey= (HairKey*)pa->hair + k;
+                                       thkey= (HairKey *)pa->hair + k;
                                        thkey->time= pa->time + k * framestep;
 
                                        key3[0].time= thkey->time/ 100.0f;
@@ -4139,7 +4139,7 @@ static void PE_create_particle_edit(Scene *scene, Object *ob, PointCache *cache,
                return;
 
        if (!edit) {
-               totpoint = psys ? psys->totpart : (int)((PTCacheMem*)cache->mem_cache.first)->totpoint;
+               totpoint = psys ? psys->totpart : (int)((PTCacheMem *)cache->mem_cache.first)->totpoint;
 
                edit= MEM_callocN(sizeof(PTCacheEdit), "PE_create_particle_edit");
                edit->points=MEM_callocN(totpoint*sizeof(PTCacheEditPoint), "PTCacheEditPoints");
index cca37dfdcd82e585a96fb103ccda38d8193bfc8a..c6aaae6b87963f314ceab873fe861026a8e155b1 100644 (file)
@@ -5366,7 +5366,7 @@ void ED_space_image_paint_update(wmWindowManager *wm, ToolSettings *settings)
        for (win = wm->windows.first; win; win = win->next)
                for (sa = win->screen->areabase.first; sa; sa = sa->next)
                        if (sa->spacetype == SPACE_IMAGE)
-                               if (((SpaceImage*)sa->spacedata.first)->mode == SI_MODE_PAINT)
+                               if (((SpaceImage *)sa->spacedata.first)->mode == SI_MODE_PAINT)
                                        enabled = TRUE;
 
        if (enabled) {
index 7f39545258d50bd1b9e82212022645c04a10fc20..4fe4ad133a94b9816ef8202b5cbb051a818a6431 100644 (file)
@@ -252,7 +252,7 @@ static void file_refresh(const bContext *C, ScrArea *UNUSED(sa))
 
 static void file_listener(ScrArea *sa, wmNotifier *wmn)
 {
-       /* SpaceFile *sfile = (SpaceFile*)sa->spacedata.first; */
+       /* SpaceFile *sfile = (SpaceFile *)sa->spacedata.first; */
 
        /* context changes */
        switch (wmn->category) {
index 749ba75cfa1a07d4493476f41d99c2530332ec58..04566af2b3ba4e0f4cbecd1bcf8942d5bcb52ce7 100644 (file)
@@ -522,7 +522,7 @@ static void draw_image_buffer_tiled(SpaceImage *sima, ARegion *ar, Scene *scene,
        dy = ibuf->y / ima->yrep;
        sx = (sima->curtile % ima->xrep) * dx;
        sy = (sima->curtile / ima->xrep) * dy;
-       rect = get_part_from_buffer((unsigned int*)display_buffer, ibuf->x, sx, sy, sx + dx, sy + dy);
+       rect = get_part_from_buffer((unsigned int *)display_buffer, ibuf->x, sx, sy, sx + dx, sy + dy);
        
        /* draw repeated */
        for (sy = 0; sy + dy <= ibuf->y; sy += dy) {
index 7cb89b6bc6be29aedbd682bfd325a2436f059da9..034c382cfd21e5d49d4277bfca45ab187f558267 100644 (file)
@@ -101,7 +101,7 @@ static SpaceLink *info_new(const bContext *UNUSED(C))
 /* not spacelink itself */
 static void info_free(SpaceLink *UNUSED(sl))
 {      
-//     SpaceInfo *sinfo= (SpaceInfo*) sl;
+//     SpaceInfo *sinfo = (SpaceInfo *) sl;
        
 }
 
index 5376b82f24c873c288ba870345f2a87beec43efe..1ea3876f5cc1e84eadeac2f080bfe8410833a9ce 100644 (file)
@@ -80,7 +80,7 @@ static SpaceLink *userpref_new(const bContext *UNUSED(C))
 /* not spacelink itself */
 static void userpref_free(SpaceLink *UNUSED(sl))
 {      
-//     SpaceUserPref *spref= (SpaceUserPref*) sl;
+//     SpaceUserPref *spref = (SpaceUserPref *)sl;
        
 }
 
index 633adbf47aeddd6b1f5e400435271be7e7a1b2d2..25ad85d3db8f2de93833cbe7d1dfb617afd0fe8e 100644 (file)
@@ -243,7 +243,7 @@ static void drawgrid_draw(ARegion *ar, double wx, double wy, double x, double y,
        verts[1][1] = (double)ar->winy;
 
        /* iter over 'X' */
-       verts[0][0] = verts[1][0] = x - dx *floor(x / dx);
+       verts[0][0] = verts[1][0] = x - dx * floor(x / dx);
        glEnableClientState(GL_VERTEX_ARRAY);
        glVertexPointer(2, GL_DOUBLE, 0, verts);
 
@@ -257,7 +257,7 @@ static void drawgrid_draw(ARegion *ar, double wx, double wy, double x, double y,
        verts[1][0] = (double)ar->winx;
 
        /* iter over 'Y' */
-       verts[0][1] = verts[1][1] = y - dx *floor(y / dx);
+       verts[0][1] = verts[1][1] = y - dx * floor(y / dx);
        while (verts[0][1] < ar->winy) {
                glDrawArrays(GL_LINES, 0, 2);
                verts[0][1] = verts[1][1] = verts[0][1] + dx;
@@ -730,7 +730,7 @@ static void draw_rotation_guide(RegionView3D *rv3d)
                        glColor4fv(color);
                        glBegin(GL_LINE_LOOP);
                        for (i = 0, angle = 0.f; i < ROT_AXIS_DETAIL; ++i, angle += step) {
-                               float p[3] = {s *cosf(angle), s * sinf(angle), 0.0f};
+                               float p[3] = {s * cosf(angle), s * sinf(angle), 0.0f};
 
                                if (!upright) {
                                        mul_qt_v3(q, p);
index 4ca9bd954850bc3a2a5bbd6a90185adf20ae3682..e55e97e501bb7a7fcd7115826b5174070c4bf130 100644 (file)
@@ -607,9 +607,9 @@ static int snap_sel_to_grid(bContext *C, wmOperator *UNUSED(op))
                        else {
                                ob->recalc |= OB_RECALC_OB;
                                
-                               vec[0] = -ob->obmat[3][0] + gridf *floorf(0.5f + ob->obmat[3][0] / gridf);
-                               vec[1] = -ob->obmat[3][1] + gridf *floorf(0.5f + ob->obmat[3][1] / gridf);
-                               vec[2] = -ob->obmat[3][2] + gridf *floorf(0.5f + ob->obmat[3][2] / gridf);
+                               vec[0] = -ob->obmat[3][0] + gridf * floorf(0.5f + ob->obmat[3][0] / gridf);
+                               vec[1] = -ob->obmat[3][1] + gridf * floorf(0.5f + ob->obmat[3][1] / gridf);
+                               vec[2] = -ob->obmat[3][2] + gridf * floorf(0.5f + ob->obmat[3][2] / gridf);
                                
                                if (ob->parent) {
                                        BKE_object_where_is_calc(scene, ob);
index 5add372cd4ee6548e09277937f6dd2212355eae5..53b00f441c8e2ffe6bbfd75e37b2fdfc248dce96 100644 (file)
@@ -168,9 +168,9 @@ int imb_is_a_hdr(unsigned char *buf)
 {
        /* For recognition, Blender only loads first 32 bytes, so use #?RADIANCE id instead */
        /* update: actually, the 'RADIANCE' part is just an optional program name, the magic word is really only the '#?' part */
-       //if (strstr((char*)buf, "#?RADIANCE")) return 1;
+       //if (strstr((char *)buf, "#?RADIANCE")) return 1;
        if (strstr((char *)buf, "#?")) return 1;
-       // if (strstr((char*)buf, "32-bit_rle_rgbe")) return 1;
+       // if (strstr((char *)buf, "32-bit_rle_rgbe")) return 1;
        return 0;
 }
 
index e09fdf259c6ef5f69f97caaad9f85030516ad6e2..83830f260e1010916233b3746fd95425e03bbb02 100644 (file)
@@ -114,7 +114,7 @@ static int imb_tiff_DummyMapProc(thandle_t fd, tdata_t *pbase, toff_t *psize)
  * Reads data from an in-memory TIFF file.
  *
  * \param handle: Handle of the TIFF file (pointer to ImbTIFFMemFile).
- * \param data:   Buffer to contain data (treat as void*).
+ * \param data:   Buffer to contain data (treat as (void *)).
  * \param n:      Number of bytes to read.
  *
  * \return: Number of bytes actually read.
index 2878d3036324de0a044ae078341f1f76081ca659..a343315264d2978a03f822dc833a5c8ed8ca1b7b 100644 (file)
@@ -65,7 +65,7 @@ static CompBuf *dblur(bNode *node, CompBuf *img, int iterations, int wrap,
                center_y_pix = center_y * img->y;
 
                tx =  itsc * D * cosf(a);
-               ty = -itsc *D *sinf(a);
+               ty = -itsc * D * sinf(a);
                sc =  itsc * zoom;
                rot = itsc * spin;
 
index 59a4d6818c83925cb3d9436bd7e57a55257645b9..a61cf00d81c3e662c7d56cba97c0617711ce8752 100644 (file)
@@ -223,13 +223,13 @@ bNodeTemplate node_group_template(bNode *node)
 {
        bNodeTemplate ntemp;
        ntemp.type = NODE_GROUP;
-       ntemp.ngroup = (bNodeTree*)node->id;
+       ntemp.ngroup = (bNodeTree *)node->id;
        return ntemp;
 }
 
 void node_group_init(bNodeTree *ntree, bNode *node, bNodeTemplate *ntemp)
 {
-       node->id = (ID*)ntemp->ngroup;
+       node->id = (ID *)ntemp->ngroup;
        
        /* NB: group socket input/output roles are inverted internally!
         * Group "inputs" work as outputs in links and vice versa.
index 01495c793a8586392c96704f187e590e0aac21bb..53d0e10a01e6b1fd89c89d8b0c72b060c622e6bb 100644 (file)
@@ -37,7 +37,7 @@
 
 #include "../generic/py_capi_utils.h"
 
-static bContext*  __py_context = NULL;
+static bContext *__py_context = NULL;
 bContext   *BPy_GetContext(void) { return __py_context; }
 void        BPy_SetContext(bContext *C) { __py_context = C; }
 
index 874999a8aaeed90a055f1430e928966c35a5e1dd..78b4c3b8787f9ad546b125e351b7ffd8547ac5a9 100644 (file)
@@ -3930,7 +3930,7 @@ static void add_lightgroup(Render *re, Group *group, int exclusive)
        for (go= group->gobject.first; go; go= go->next) {
                go->lampren= NULL;
 
-               if(go->ob->restrictflag & OB_RESTRICT_RENDER)
+               if (go->ob->restrictflag & OB_RESTRICT_RENDER)
                        continue;
                
                if (go->ob->lay & re->lay) {
index 6a1517e19fbb3f99c16b94827da902ea325eb73c..94e94b98d2635bffc67d938d34d8d2293666c163 100644 (file)
@@ -275,7 +275,7 @@ void GetSkyXYZRadiance(struct SunSky *sunsky, float theta, float phi, float colo
        /* Compute xyY values */
        x = PerezFunction(sunsky, sunsky->perez_x, theta, gamma, sunsky->zenith_x);
        y = PerezFunction(sunsky, sunsky->perez_y, theta, gamma, sunsky->zenith_y);
-       Y = 6.666666667e-5f *nfade *hfade *PerezFunction(sunsky, sunsky->perez_Y, theta, gamma, sunsky->zenith_Y);
+       Y = 6.666666667e-5f * nfade * hfade * PerezFunction(sunsky, sunsky->perez_Y, theta, gamma, sunsky->zenith_Y);
 
        if (sunsky->sky_exposure != 0.0f)
                Y = 1.0 - exp(Y * sunsky->sky_exposure);
index 18072d805fc7739847ad181f2643a65d469c5b27..d0bed4e5965d275fa6a6708b178a2f36f6f330d6 100644 (file)
@@ -933,7 +933,7 @@ static int wm_window_timer(const bContext *C)
                                wt->delta = time - wt->ltime;
                                wt->duration += wt->delta;
                                wt->ltime = time;
-                               wt->ntime = wt->stime + wt->timestep *ceil(wt->duration / wt->timestep);
+                               wt->ntime = wt->stime + wt->timestep * ceil(wt->duration / wt->timestep);
 
                                if (wt->event_type == TIMERJOBS)
                                        wm_jobs_timer(C, wm, wt);