style cleanup
authorCampbell Barton <ideasman42@gmail.com>
Mon, 7 Jan 2013 03:24:22 +0000 (03:24 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 7 Jan 2013 03:24:22 +0000 (03:24 +0000)
source/blender/blenkernel/intern/seqeffects.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenlib/BLI_scanfill.h
source/blender/blenlib/intern/math_geom.c
source/blender/bmesh/bmesh_class.h
source/blender/bmesh/tools/bmesh_decimate_collapse.c
source/blender/editors/physics/physics_fluid.c
source/blender/editors/render/render_preview.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/render/intern/raytrace/rayobject_octree.cpp

index 3ca04f235b8056b42e73c41a1a9555dbf20a7ded..c64609c8e70bd0a14085b562709601f0876ed82b 100644 (file)
@@ -1150,7 +1150,7 @@ static void do_mul_effect_byte(float facf0, float facf1, int x, int y, unsigned
        fac3 = (int)(256.0f * facf1);
 
        /* formula:
-        *              fac * (a * b) + (1-fac)*a  => fac * a * (b - 1) + axaux = c * px + py * s; //+centx
+        *              fac * (a * b) + (1 - fac) * a  => fac * a * (b - 1) + axaux = c * px + py * s; //+centx
         *              yaux = -s * px + c * py; //+centy
         */
 
index 12a82ba38d71c1cd1183a2e89b1fc01a46d44740..d381a157fcca14a46bcf4182db27932a6155a940 100644 (file)
@@ -3320,7 +3320,7 @@ static CCGDerivedMesh *getCCGDerivedMesh(CCGSubSurf *ss,
                
 
                /*I think this is for interpolating the center vert?*/
-               w2 = w; // + numVerts*(g2_wid-1)*(g2_wid-1); //numVerts*((g2_wid-1)*g2_wid+g2_wid-1);
+               w2 = w; // + numVerts*(g2_wid-1) * (g2_wid-1); //numVerts*((g2_wid-1) * g2_wid+g2_wid-1);
                DM_interp_vert_data(dm, &ccgdm->dm, vertidx, w2,
                                    numVerts, vertNum);
                if (vertOrigIndex) {
index 5204e0dd718d5e5a4246bc358fadbe9958f8ad45..7830c0675b4a834e7539695888b7b5b442c51aec 100644 (file)
@@ -103,7 +103,7 @@ enum {
        BLI_SCANFILL_CALC_REMOVE_DOUBLES   = (1 << 1),
 
        /* note: This flag removes checks for overlapping polygons.
-        * when this flag is set, we'll never get back more faces then (totvert - 2)*/
+        * when this flag is set, we'll never get back more faces then (totvert - 2) */
        BLI_SCANFILL_CALC_HOLES            = (1 << 2)
 };
 
index 3527af365ec1cab3367f992396abf50a465e55b2..b78b15de5a6e79f50f792ba5e18323e9bdcabbc8 100644 (file)
@@ -1817,7 +1817,7 @@ static int point_in_slice_as(float p[3], float origin[3], float normal[3])
        return 1;
 }
 
-/*mama (knowing the squared length of the normal)*/
+/*mama (knowing the squared length of the normal) */
 static int point_in_slice_m(float p[3], float origin[3], float normal[3], float lns)
 {
        float h, rp[3];
index 922c6886c13bdf1da5b3a7dfacd7ac274c78dcbd..5d7ded2024ddb66f8cfd96019e66874ae00d86bc 100644 (file)
@@ -184,10 +184,10 @@ typedef struct BMesh {
         * BM_LOOP isn't handled so far. */
        char elem_index_dirty;
 
-       /*element pools*/
+       /* element pools */
        struct BLI_mempool *vpool, *epool, *lpool, *fpool;
 
-       /*operator api stuff (must be all NULL or all alloc'd)*/
+       /* operator api stuff (must be all NULL or all alloc'd) */
        struct BLI_mempool *vtoolflagpool, *etoolflagpool, *ftoolflagpool;
 
        int stackdepth;
@@ -205,7 +205,7 @@ typedef struct BMesh {
         * Only use when the edit mesh cant be accessed - campbell */
        short selectmode;
        
-       /*ID of the shape key this bmesh came from*/
+       /* ID of the shape key this bmesh came from */
        int shapenr;
        
        int walkers, totflags;
index 7c054d84405f93f9ea170706c59f505b27698b88..9d2d2b75d6e2df78b4977df110bce84a4c94df53 100644 (file)
@@ -172,7 +172,7 @@ static int bm_edge_collapse_is_degenerate_flip(BMEdge *e, const float optimize_c
 #endif
 
                                /* use a small value rather then zero so we don't flip a face in multiple steps
-                                * (first making it zero area, then flipping again)*/
+                                * (first making it zero area, then flipping again) */
                                if (dot_v3v3(cross_exist, cross_optim) <= FLT_EPSILON) {
                                        //printf("no flip\n");
                                        return TRUE;
index c54ac485be60ec56c9c7c43d2d6565d0bbcb8640..fc55b2b5915edc24d2b36b9d6674cbdec298202d 100644 (file)
@@ -237,7 +237,7 @@ static void init_time(FluidsimSettings *domainSettings, FluidAnimChannels *chann
 {
        int i;
        
-       channels->timeAtFrame = MEM_callocN((channels->length+1)*sizeof(float), "timeAtFrame channel");
+       channels->timeAtFrame = MEM_callocN((channels->length + 1) * sizeof(float), "timeAtFrame channel");
        
        channels->timeAtFrame[0] = channels->timeAtFrame[1] = domainSettings->animStart; // start at index 1
        
index 2b714daecf8f2ac04eac1edb54200139a412cdbb..25ad1f61aafa21b89b473f6015325a9b6786684c 100644 (file)
@@ -712,7 +712,7 @@ static void shader_preview_render(ShaderPreview *sp, ID *id, int split, int firs
        else {
                /* validate owner */
                //if (ri->rect == NULL)
-               //      ri->rect= MEM_mallocN(sizeof(int)*ri->pr_rectx*ri->pr_recty, "BIF_previewrender");
+               //      ri->rect= MEM_mallocN(sizeof(int) * ri->pr_rectx*ri->pr_recty, "BIF_previewrender");
                //RE_ResultGet32(re, ri->rect);
        }
 
index d66236d1c5151660585b0b541dfa92bee01d3874..202b5befa0192ab42f9cfb336970417d8f2a4d90 100644 (file)
@@ -937,7 +937,7 @@ static void draw_selected_name(Scene *scene, Object *ob, rcti *rect)
                }
                
                /* color depends on whether there is a keyframe */
-               if (id_frame_has_keyframe((ID *)ob, /*BKE_scene_frame_get(scene)*/ (float)(CFRA), ANIMFILTER_KEYS_LOCAL))
+               if (id_frame_has_keyframe((ID *)ob, /* BKE_scene_frame_get(scene) */ (float)(CFRA), ANIMFILTER_KEYS_LOCAL))
                        UI_ThemeColor(TH_VERTEX_SELECT);
                else
                        UI_ThemeColor(TH_TEXT_HI);
@@ -3036,10 +3036,10 @@ static void view3d_main_area_draw_objects(const bContext *C, ARegion *ar, const
 
                                for (x = 0; x < XTOT - 1; x++) {
                                        for (y = 0; y < YTOT - 1; y++) {
-                                               indices[x][y][0] = x*XTOT + y;
-                                               indices[x][y][1] = x*XTOT + y + 1;
-                                               indices[x][y][2] = (x + 1)*XTOT + y + 1;
-                                               indices[x][y][3] = (x + 1)*XTOT + y;
+                                               indices[x][y][0] = x * XTOT + y;
+                                               indices[x][y][1] = x * XTOT + y + 1;
+                                               indices[x][y][2] = (x + 1) * XTOT + y + 1;
+                                               indices[x][y][3] = (x + 1) * XTOT + y;
                                        }
                                }
 
@@ -3089,7 +3089,7 @@ static void view3d_main_area_draw_objects(const bContext *C, ARegion *ar, const
                        glVertexPointer(2, GL_FLOAT, 0, grid_pos);
                        glColorPointer(4, GL_UNSIGNED_BYTE, 0, grid_col);
 
-                       glDrawElements(GL_QUADS, (XTOT - 1)*(YTOT - 1)*4, GL_UNSIGNED_SHORT, indices);
+                       glDrawElements(GL_QUADS, (XTOT - 1) * (YTOT - 1) * 4, GL_UNSIGNED_SHORT, indices);
                        glDisableClientState(GL_VERTEX_ARRAY);
                        glDisableClientState(GL_COLOR_ARRAY);
 
index 148e3417ea9029df41c341d49b613f8d060b64f7..658ab9dc091e38429249e4b471b857b138e84cff 100644 (file)
@@ -1015,7 +1015,7 @@ static int RE_rayobject_octree_intersect(RayObject *tree, Isect *is)
                                vec2[2] = oz1 - dda_lambda * doz;
                                calc_ocval_ray(&ocval, (float)xo, (float)yo, (float)zo, vec1, vec2);
 
-                               //is->dist = (u1+dda_lambda*(u2-u1))*o_lambda;
+                               //is->dist = (u1 + dda_lambda * (u2 - u1)) * o_lambda;
                                if (testnode(oc, is, no, ocval) )
                                        found = 1;