code cleanup: warnings and style.
authorCampbell Barton <ideasman42@gmail.com>
Fri, 12 Apr 2013 00:50:40 +0000 (00:50 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 12 Apr 2013 00:50:40 +0000 (00:50 +0000)
build_files/cmake/cmake_static_check_clang_array.py
source/blender/blenkernel/intern/library.c
source/blender/blenlib/BLI_math_vector.h
source/blender/blenlib/intern/storage.c
source/blender/editors/render/render_opengl.c
source/blender/freestyle/intern/stroke/StrokeRep.cpp
source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp

index 448454c2177667a42b397ea44b0c7c6327404347..22b5d07c40c90b13edf12e92bcdc15dfc36944e4 100644 (file)
@@ -66,7 +66,7 @@ def main():
             percent_str = "[" + ("%.2f]" % percent).rjust(7) + " %:"
 
             sys.stdout.flush()
-            sys.stdout.write("%s " % percent_str)
+            sys.stdout.write("%s %s\n" % (percent_str, c))
 
         return subprocess.Popen(cmd)
 
index da642f11e8d3ec9ce16277c9c27f01a1be080dc8..db4706e3c6c35ac484d4063b1839add0491b333f 100644 (file)
 #include "BPY_extern.h"
 #endif
 
-#define MAX_IDPUP  60  /* was 24 */
-
 /* GS reads the memory pointed at in a specific ordering. 
  * only use this definition, makes little and big endian systems
  * work fine, in conjunction with MAKE_ID */
@@ -1078,6 +1076,8 @@ ID *BKE_libblock_find_name(const short type, const char *name)      /* type: "OB
 }
 
 #if 0 /* UNUSED */
+#define MAX_IDPUP  60  /* was 24 */
+
 static void get_flags_for_id(ID *id, char *buf) 
 {
        int isfake = id->flag & LIB_FAKEUSER;
index 15c977981a504ab002a8546b20ba14be50db9e30..ee0a9db4f02d1c41d1d11de495a09ee23bde64b3 100644 (file)
@@ -169,7 +169,7 @@ MINLINE float normalize_v3_v3(float r[3], const float a[3]);
 /******************************* Interpolation *******************************/
 
 void interp_v2_v2v2(float r[2], const float a[2], const float b[2], const float t);
-void interp_v2_v2v2v2(float r[2], const float a[2], const float b[2], const float c[3], const float t[3]);
+void interp_v2_v2v2v2(float r[2], const float a[2], const float b[2], const float c[2], const float t[3]);
 void interp_v3_v3v3(float r[3], const float a[3], const float b[3], const float t);
 void interp_v3_v3v3v3(float p[3], const float v1[3], const float v2[3], const float v3[3], const float w[3]);
 void interp_v3_v3v3v3v3(float p[3], const float v1[3], const float v2[3], const float v3[3], const float v4[3], const float w[4]);
@@ -193,7 +193,7 @@ MINLINE int is_one_v3(const float a[3]);
 
 MINLINE int equals_v2v2(const float v1[2], const float v2[2]);
 MINLINE int equals_v3v3(const float a[3], const float b[3]);
-MINLINE int compare_v2v2(const float a[3], const float b[3], const float limit);
+MINLINE int compare_v2v2(const float a[2], const float b[2], const float limit);
 MINLINE int compare_v3v3(const float a[3], const float b[3], const float limit);
 MINLINE int compare_len_v3v3(const float a[3], const float b[3], const float limit);
 
index 3665b957c41407ca18368468cb44b29ef3e77de8..24d4f7cdfe34cbd9d384cae4b9fc4412113e1a0c 100644 (file)
@@ -520,7 +520,7 @@ int BLI_exists(const char *name)
 
        /* change error mode so user does not get a "no disk in drive" popup
         * when looking for a file on an empty CD/DVD drive */
-       old_error_mode = SetErrorMode(SEM_FAILCRITICALERRORS|SEM_NOOPENFILEERRORBOX);
+       old_error_mode = SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOOPENFILEERRORBOX);
 
 #ifndef __MINGW32__
        res = _wstat(tmp_16, &st);
index 2c54ce4cdefd39a8ae91f36f937bf850cf5b3b08..edef6e52e40cb8ce1247af7b2a2bf11fad300d32 100644 (file)
@@ -245,12 +245,12 @@ static void screen_opengl_render_apply(OGLRender *oglrender)
                char err_out[256] = "unknown";
                ImBuf *ibuf_view = ED_view3d_draw_offscreen_imbuf_simple(scene, scene->camera, oglrender->sizex, oglrender->sizey,
                                                                         IB_rect, OB_SOLID, FALSE, TRUE,
-                                                                                                                                (draw_sky)? R_ADDSKY: R_ALPHAPREMUL, err_out);
+                                                                        (draw_sky) ? R_ADDSKY: R_ALPHAPREMUL, err_out);
                camera = scene->camera;
 
                if (ibuf_view) {
                        /* steal rect reference from ibuf */
-                       rect = (unsigned char*)ibuf_view->rect;
+                       rect = (unsigned char *)ibuf_view->rect;
                        ibuf_view->mall &= ~IB_rect;
 
                        IMB_freeImBuf(ibuf_view);
@@ -272,8 +272,8 @@ static void screen_opengl_render_apply(OGLRender *oglrender)
                /* sequencer has got trickier conversion happened above
                 * also assume opengl's space matches byte buffer color space */
                IMB_buffer_float_from_byte(rr->rectf, rect,
-                                                                       IB_PROFILE_LINEAR_RGB, IB_PROFILE_SRGB, TRUE,
-                                                                       oglrender->sizex, oglrender->sizey, oglrender->sizex, oglrender->sizex);
+                                          IB_PROFILE_LINEAR_RGB, IB_PROFILE_SRGB, true,
+                                          oglrender->sizex, oglrender->sizey, oglrender->sizex, oglrender->sizex);
        }
 
        /* rr->rectf is now filled with image data */
@@ -292,8 +292,8 @@ static void screen_opengl_render_apply(OGLRender *oglrender)
                        imb_addrectImBuf(ibuf);
 
                IMB_partial_display_buffer_update(ibuf, rr->rectf, rect, rr->rectx, 0, 0,
-                                                                                 &scene->view_settings, &scene->display_settings,
-                                                                                 0, 0, rr->rectx, rr->recty, TRUE);
+                                                 &scene->view_settings, &scene->display_settings,
+                                                 0, 0, rr->rectx, rr->recty, true);
 
                /* write file for animation */
                if (oglrender->write_still) {
index 42fd9660b08b884eaac1af230ee92338c7cdbd2e..dacf463ab88771ba15dac8039fbbdd4272320c41 100644 (file)
@@ -98,10 +98,12 @@ static bool notValid (Vec2r p)
               (p[0] < -HUGE_COORD) || (p[1] < -HUGE_COORD);
 }
 
+#if 0
 static real crossP(const Vec2r& A, const Vec2r& B)
 {
        return A[0] * B[1] - A[1] * B[0];
 }
+#endif
 
 void Strip::createStrip (const vector<StrokeVertex*>& iStrokeVertices)
 {
index e92f7bd12680ce538bf337134ecdb251d73fd729..e01530f2b118476d4763a161857faf0343c94d9d 100644 (file)
@@ -1758,16 +1758,17 @@ struct OcclusionBuffer
                                        6,5,1,2,
                                        7,6,2,3,
                                        5,4,0,1};
-               for (unsigned int i=0;i<(sizeof(d)/sizeof(d[0]));)
-               {
-                       const btVector4 p[] = {x[d[i++]],
-                                              x[d[i++]],
-                                              x[d[i++]],
-                                              x[d[i++]]};
-                       if (clipDraw<4,QueryOCL>(p,1.f,0.f)) 
-                               return(true);
+               for (unsigned int i = 0; i < (sizeof(d) / sizeof(d[0]));) {
+                       const btVector4 p[] = {x[d[i + 0]],
+                                              x[d[i + 1]],
+                                              x[d[i + 2]],
+                                              x[d[i + 3]]};
+                       i += 4;
+                       if (clipDraw<4, QueryOCL>(p, 1.0f, 0.0f)) {
+                               return true;
+                       }
                }
-               return(false);
+               return false;
        }
 };